import java.io.IOException;\r
import java.io.Serializable;\r
import java.io.UnsupportedEncodingException;\r
-import java.util.ArrayList;\r
-import java.util.List;\r
\r
import javax.enterprise.context.SessionScoped;\r
import javax.inject.Inject;\r
\r
import com.indexdata.mkjsf.config.ConfigurationReader;\r
import com.indexdata.mkjsf.pazpar2.commands.CommandParameter;\r
-import com.indexdata.mkjsf.pazpar2.commands.Pazpar2Commands;\r
import com.indexdata.mkjsf.pazpar2.commands.sp.AuthCommand;\r
import com.indexdata.mkjsf.pazpar2.commands.sp.InitDocUpload;\r
import com.indexdata.mkjsf.pazpar2.data.ResponseDataObject;\r
import com.indexdata.mkjsf.pazpar2.data.ResponseParser;\r
-import com.indexdata.mkjsf.pazpar2.data.Responses;\r
import com.indexdata.mkjsf.pazpar2.data.sp.CategoriesResponse;\r
import com.indexdata.mkjsf.pazpar2.data.sp.SpResponseDataObject;\r
import com.indexdata.mkjsf.utils.Utils;\r
\r
@Inject ConfigurationReader configurator; \r
@Inject Pz2Bean pz2;\r
- @Inject Pazpar2Commands pzreq;\r
- @Inject Responses pzresp;\r
\r
public ServiceProxyExtensions() {\r
this.initDocUpload = new InitDocUpload(this);\r
//stateMgr.addStateListener(this);\r
}\r
\r
- public void authenticate() {\r
- String command = "auth";\r
- if (pzresp.getSp().getAuth().unsupportedCommand()) {\r
+ public void authenticate() { \r
+ if (pz2.getPzresp().getSp().getAuth().unsupportedCommand()) {\r
logger.warn("Running seemingly unsupported command [auth] against SP.");\r
}\r
pz2.resetSearchAndRecordCommands();\r
- pzresp.getSp().resetAuthAndBeyond(true);\r
- AuthCommand auth = pzreq.getSp().getAuth(); \r
+ pz2.getPzresp().getSp().resetAuthAndBeyond(true);\r
+ AuthCommand auth = pz2.getPzreq().getSp().getAuth(); \r
ClientCommandResponse commandResponse = pz2.getSpClient().send(auth); \r
String renamedResponse = renameResponseElement(commandResponse.getResponseString(), "auth"); \r
commandResponse.setResponseToParse(renamedResponse);\r
SpResponseDataObject responseObject = (SpResponseDataObject) ResponseParser.getParser().getDataObject(commandResponse); \r
if (ResponseParser.docTypes.contains(responseObject.getType())) {\r
- pzresp.put(auth.getCommandName(), responseObject);\r
+ pz2.getPzresp().put(auth.getCommandName(), responseObject);\r
}\r
if (responseObject.unsupportedCommand()) {\r
logger.error("auth command does not seem to be supported by this Service Proxy");\r
}\r
\r
public void login(String un, String pw, String navigateTo) { \r
- pzreq.getSp().getAuth().setUsername(un);\r
- pzreq.getSp().getAuth().setPassword(pw);\r
+ pz2.getPzreq().getSp().getAuth().setUsername(un);\r
+ pz2.getPzreq().getSp().getAuth().setPassword(pw);\r
login("");\r
} \r
\r
@Override \r
public String login(String navigateTo) {\r
- AuthCommand auth = pzreq.getSp().getAuth(); \r
+ AuthCommand auth = pz2.getPzreq().getSp().getAuth(); \r
auth.setParameterInState(new CommandParameter("action","=","login"));\r
authenticate();\r
return navigateTo;\r
}\r
\r
public void ipAuthenticate () { \r
- AuthCommand auth = pzreq.getSp().getAuth(); \r
+ AuthCommand auth = pz2.getPzreq().getSp().getAuth(); \r
auth.setParameterInState(new CommandParameter("action","=","ipAuth"));\r
authenticate();\r
}\r
logger.info("Paths: " + pz2.getSpClient().getInitDocPaths());\r
logger.info("Path: " + initDocPath); \r
pz2.resetSearchAndRecordCommands();\r
- pzresp.getSp().resetAuthAndBeyond(true);\r
+ pz2.getPzresp().getSp().resetAuthAndBeyond(true);\r
ClientCommandResponse response = pz2.getSpClient().postInitDoc(initDocPath + getInitFileName()); \r
return response;\r
}\r
@Override\r
public HttpResponseWrapper postInit(byte[] initDoc, boolean includeDebug) throws UnsupportedEncodingException, IOException { \r
pz2.resetSearchAndRecordCommands();\r
- pzresp.getSp().resetAuthAndBeyond(true);\r
+ pz2.getPzresp().getSp().resetAuthAndBeyond(true);\r
HttpResponseWrapper response = pz2.getSpClient().postInitDoc(initDoc,includeDebug); \r
return response;\r
}\r
public void submitInitDoc () throws IOException {\r
ClientCommandResponse response = (ClientCommandResponse) initDocUpload.submit();\r
ResponseDataObject responseObject = ResponseParser.getParser().getDataObject(response);\r
- logger.info("Putting init response to : " + Utils.objectId(pzresp));\r
- pzresp.put("init", responseObject);\r
+ logger.info("Putting init response to : " + Utils.objectId(pz2.getPzresp()));\r
+ pz2.getPzresp().put("init", responseObject);\r
}\r
\r
public void setIncludeInitDocDebug(boolean bool) {\r
public CategoriesResponse getCategories () { \r
String command="categories";\r
if (pz2.isServiceProxyService()) {\r
- if (pzresp.getSp().getCategories().unsupportedCommand()) {\r
+ if (pz2.getPzresp().getSp().getCategories().unsupportedCommand()) {\r
logger.info("Skipping seemingly unsupported command: " + command); \r
return new CategoriesResponse();\r
} else {\r