\r
import static com.indexdata.pz2utils4jsf.utils.Utils.nl;\r
\r
+import java.io.BufferedReader;\r
import java.io.ByteArrayOutputStream;\r
import java.io.File;\r
+import java.io.FileReader;\r
import java.io.IOException;\r
import java.util.ArrayList;\r
import java.util.HashMap;\r
import org.apache.http.conn.scheme.PlainSocketFactory;\r
import org.apache.http.conn.scheme.Scheme;\r
import org.apache.http.conn.scheme.SchemeRegistry;\r
+import org.apache.http.entity.ByteArrayEntity;\r
import org.apache.http.entity.FileEntity;\r
import org.apache.http.impl.client.DefaultHttpClient;\r
import org.apache.http.impl.conn.PoolingClientConnectionManager;\r
import com.indexdata.pz2utils4jsf.config.Configuration;\r
import com.indexdata.pz2utils4jsf.config.ConfigurationReader;\r
import com.indexdata.pz2utils4jsf.errors.ConfigurationException;\r
-import com.indexdata.pz2utils4jsf.pazpar2.CommandParameter;\r
import com.indexdata.pz2utils4jsf.pazpar2.CommandResponse;\r
-import com.indexdata.pz2utils4jsf.pazpar2.Pazpar2Command;\r
import com.indexdata.pz2utils4jsf.pazpar2.SearchClient;\r
+import com.indexdata.pz2utils4jsf.pazpar2.commands.CommandParameter;\r
+import com.indexdata.pz2utils4jsf.pazpar2.commands.Pazpar2Command;\r
import com.indexdata.pz2utils4jsf.pazpar2.sp.auth.AuthenticationEntity;\r
import com.indexdata.pz2utils4jsf.pazpar2.sp.auth.ServiceProxyUser;\r
import com.indexdata.pz2utils4jsf.utils.Utils;\r
public static final String SP_INIT_DOC_PATHS = "SP_INIT_DOC_PATHS";\r
private String serviceUrl = "undefined";\r
private String[] initDocPaths = null;\r
+ private Configuration config = null;\r
\r
ProxyPz2ResponseHandler handler = new ProxyPz2ResponseHandler();\r
private HttpClient client;\r
public void configure (ConfigurationReader configReader) {\r
logger.info(Utils.objectId(this) + " is configuring using the provided " + Utils.objectId(configReader));\r
try {\r
- Configuration config = configReader.getConfiguration(this); \r
+ config = configReader.getConfiguration(this); \r
serviceUrl = config.getMandatory(SERVICE_PROXY_URL); \r
this.initDocPaths = getMultiProperty(config.get(SP_INIT_DOC_PATHS)); \r
} catch (ConfigurationException c) {\r
try { \r
logger.info("Authenticating [" + user.getProperty("name") + "]");\r
this.user = (ServiceProxyUser) user;\r
- Pazpar2Command auth = new Pazpar2Command("auth");\r
+ Pazpar2Command auth = new Pazpar2Command("auth",null);\r
auth.setParameter(new CommandParameter("action","=","login"));\r
auth.setParameter(new CommandParameter("username","=",user.getProperty("name")));\r
auth.setParameter(new CommandParameter("password","=",user.getProperty("password")));\r
\r
public boolean checkAuthentication () {\r
try {\r
- Pazpar2Command check = new Pazpar2Command("auth");\r
+ Pazpar2Command check = new Pazpar2Command("auth",null);\r
check.setParameter(new CommandParameter("action","=","check"));\r
byte[] response = send(check);\r
logger.info(new String(response,"UTF-8"));\r
byte[] response = client.execute(httpget, handler); \r
return response;\r
}\r
-\r
\r
public class ProxyPz2ResponseHandler implements ResponseHandler<byte[]> {\r
private StatusLine statusLine = null;\r
logger.info("Looking to post the file in : [" + filePath +"]");\r
HttpPost post = new HttpPost(serviceUrl+"?command=init&includeDebug=yes");\r
File initDoc = new File(filePath);\r
+ logger.info("Posting to SP: ");\r
+ if (logger.isDebugEnabled()) {\r
+ BufferedReader reader = new BufferedReader(new FileReader(initDoc));\r
+ String line;\r
+ while ( (line = reader.readLine()) != null) {\r
+ System.out.println(line);\r
+ }\r
+ reader.close();\r
+ }\r
post.setEntity(new FileEntity(initDoc));\r
byte[] response = client.execute(post, handler);\r
- logger.info("Response on POST was: " + new String(response,"UTF-8"));\r
+ logger.debug("Response on POST was: " + new String(response,"UTF-8")); \r
return response;\r
}\r
\r
public String[] getInitDocPaths () {\r
- logger.info("Get init doc paths ");\r
- logger.info("length: " + initDocPaths.length);\r
+ logger.debug("Get init doc paths ");\r
+ logger.debug("length: " + initDocPaths.length);\r
return initDocPaths;\r
}\r
\r
+ public byte[] postInitDoc(byte[] initDoc) throws IOException {\r
+ HttpPost post = new HttpPost(serviceUrl+"?command=init&includeDebug=yes");\r
+ post.setEntity(new ByteArrayEntity(initDoc));\r
+ byte[] response = client.execute(post, handler);\r
+ logger.debug("Response on POST was: " + new String(response,"UTF-8")); \r
+ return response;\r
+ }\r
+ \r
public void setServiceProxyUrl (String url) {\r
serviceUrl = url;\r
}\r
public String getServiceProxyUrl () {\r
return serviceUrl;\r
}\r
-\r
+ \r
+ public Configuration getConfiguration () {\r
+ return config;\r
+ }\r
+ \r
}\r