# HG changeset patch
# User dwinter
# Date 1347870064 -7200
# Node ID e0efd3a9d2f0b95cc57104c28ce4fb4137a2aa27
# Parent 94ea06e320030ffc6f2114c52fe15da61aff9258
changes for escidoc1.4
diff -r 94ea06e32003 -r e0efd3a9d2f0 .classpath
--- a/.classpath Thu Sep 13 13:41:32 2012 +0200
+++ b/.classpath Mon Sep 17 10:21:04 2012 +0200
@@ -12,6 +12,7 @@
+
diff -r 94ea06e32003 -r e0efd3a9d2f0 libs/escidoc-ijc-1.3.3.jar
Binary file libs/escidoc-ijc-1.3.3.jar has changed
diff -r 94ea06e32003 -r e0efd3a9d2f0 libs/escidoc-ijc-1.4.2.jar
Binary file libs/escidoc-ijc-1.4.2.jar has changed
diff -r 94ea06e32003 -r e0efd3a9d2f0 src/de/mpiwg/itgroup/eSciDoc/Tools/DRI/CreateDRIList.java
--- a/src/de/mpiwg/itgroup/eSciDoc/Tools/DRI/CreateDRIList.java Thu Sep 13 13:41:32 2012 +0200
+++ b/src/de/mpiwg/itgroup/eSciDoc/Tools/DRI/CreateDRIList.java Mon Sep 17 10:21:04 2012 +0200
@@ -22,7 +22,7 @@
public CreateDRIList()
{
logger.setLevel(Level.DEBUG);
- connector = new EScidocBasicHandler("escidoc.mpiwg-berlin.mpg.de",8080,"dwinter","weikiki7");
+ connector = new EScidocBasicHandler("escidoc.mpiwg-berlin.mpg.de",8080,"dwinter","XXX");
}
diff -r 94ea06e32003 -r e0efd3a9d2f0 src/de/mpiwg/itgroup/eSciDoc/Tools/EScidocBasicHandler.java
--- a/src/de/mpiwg/itgroup/eSciDoc/Tools/EScidocBasicHandler.java Thu Sep 13 13:41:32 2012 +0200
+++ b/src/de/mpiwg/itgroup/eSciDoc/Tools/EScidocBasicHandler.java Mon Sep 17 10:21:04 2012 +0200
@@ -22,11 +22,16 @@
import org.apache.commons.codec.EncoderException;
+import org.apache.http.Header;
import org.apache.http.HttpEntity;
+import org.apache.http.HttpMessage;
import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
import org.apache.http.StatusLine;
import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.CookieStore;
import org.apache.http.client.HttpClient;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpDelete;
import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
import org.apache.http.client.methods.HttpGet;
@@ -35,9 +40,15 @@
import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.client.params.ClientPNames;
import org.apache.http.client.params.CookiePolicy;
+import org.apache.http.client.protocol.ClientContext;
+import org.apache.http.cookie.Cookie;
import org.apache.http.entity.InputStreamEntity;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.BasicCookieStore;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.conn.SingleClientConnManager;
+import org.apache.http.impl.cookie.BasicClientCookie;
+import org.apache.http.message.BasicNameValuePair;
import org.apache.http.protocol.BasicHttpContext;
import org.apache.http.protocol.HttpContext;
import org.apache.log4j.Logger;
@@ -59,6 +70,7 @@
+
/**
* Handler to create a connection with an eScidoc server
* @author dwinter
@@ -91,7 +103,10 @@
}
-
+ private void addHandleToMethod(final HttpMessage method,
+ final String eSciDocUserHandle) {
+ method.setHeader("Cookie", "escidocCookie=" + eSciDocUserHandle);
+ }
/**
* Logs you into escidoc and sets the httpclient field to the current client for this session
@@ -100,13 +115,16 @@
* @throws ClientProtocolException
* @throws IOException
*/
+
+
public HttpClient login() throws IOException {
httpclient = new DefaultHttpClient();
- HttpContext localContext = new BasicHttpContext();
-
- httpclient.getParams().setParameter(ClientPNames.COOKIE_POLICY, CookiePolicy.BROWSER_COMPATIBILITY);
-
+
+ //httpclient.getParams().setParameter(ClientPNames.COOKIE_POLICY, CookiePolicy.BROWSER_COMPATIBILITY);
+ httpclient.getParams().setParameter(ClientPNames.COOKIE_POLICY, CookiePolicy.RFC_2109);
+ httpclient.getParams().setParameter("http.protocol.single-cookie-header", true);
+
HttpPost httppost = new HttpPost(eScidocUrl+"/aa/login?target=/");
logger.debug("executing request");
@@ -121,19 +139,53 @@
if (entity != null) { entity.consumeContent();
}
- HttpGet httpget = new HttpGet(eScidocUrl+"/aa/j_spring_security_check?j_username="+user+"&j_password="+password);
-
- response = httpclient.execute(httpget);
- //entity = response.getEntity();
-
+
+
+ String params="j_username="+user+"&j_password="+password;
+
+
+ List nameValuePairs = new ArrayList(1);
+ nameValuePairs.add(new BasicNameValuePair("j_username",
+ user));
+ nameValuePairs.add(new BasicNameValuePair("j_password",
+ password));
+ HttpPost httpget = new HttpPost(eScidocUrl+"/aa/j_spring_security_check");
+
+ httpget.setEntity(new UrlEncodedFormEntity(nameValuePairs));
+ //httpget.setEntity(new StringEntity(params));
+//
+//
+ response = httpclient.execute(httpget);
+// //entity = response.getEntity();
+//
+ System.out.println("----------------------------------------");
+ System.out.println(response.getStatusLine());
+
+ entity = response.getEntity();
+ InputStream ct = entity.getContent();
+
+ String ret = EScidocBasicHandler.convertStreamToString(ct);
+// if (entity != null) { entity.consumeContent();
+// }
+//
+ System.out.println(ret);
+
+
+ httppost = new HttpPost(eScidocUrl+"/aa/login?target=/");
+
+ logger.debug("executing request");
+
+ response = httpclient.execute(httppost);
+ //HttpEntity entity = httppost.getRes
+
System.out.println("----------------------------------------");
System.out.println(response.getStatusLine());
entity = response.getEntity();
if (entity != null) { entity.consumeContent();
}
+
- //entity.consumeContent();
return httpclient;
}
diff -r 94ea06e32003 -r e0efd3a9d2f0 src/de/mpiwg/itgroup/eSciDoc/Tools/EScidocTools.java
--- a/src/de/mpiwg/itgroup/eSciDoc/Tools/EScidocTools.java Thu Sep 13 13:41:32 2012 +0200
+++ b/src/de/mpiwg/itgroup/eSciDoc/Tools/EScidocTools.java Mon Sep 17 10:21:04 2012 +0200
@@ -20,7 +20,7 @@
static public String MPIWG = "http://www.mpiwg-berlin.mpg.de/ns/mpiwg";
static public String RDF = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";
static public String FEDORA = "info:fedora/fedora-system:def/relations-external#";
- static public String escidocItem="http://www.escidoc.de/schemas/item/0.9";
+ static public String escidocItem="http://www.escidoc.de/schemas/item/0.10";
static public String prop="http://escidoc.de/core/01/properties/";
static public String escidocComponents="http://www.escidoc.de/schemas/components/0.9";
static public String xlink="http://www.w3.org/1999/xlink";
diff -r 94ea06e32003 -r e0efd3a9d2f0 src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/PubmanFoxridgeIdentifierRelationModell.java
--- a/src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/PubmanFoxridgeIdentifierRelationModell.java Thu Sep 13 13:41:32 2012 +0200
+++ b/src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/PubmanFoxridgeIdentifierRelationModell.java Mon Sep 17 10:21:04 2012 +0200
@@ -54,7 +54,7 @@
String itemString="/ir/item/escidoc:162177";
String escidocServer="escidoc-test.mpiwg-berlin.mpg.de";
- EScidocBasicHandler hd = new EScidocBasicHandler(escidocServer, 8080, "dwinter", "fl0rian");
+ EScidocBasicHandler hd = new EScidocBasicHandler(escidocServer, 8080, "dwinter", "XXX");
if (args.length>0){
dateString=args[0];
diff -r 94ea06e32003 -r e0efd3a9d2f0 src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/RepairPublishingInfo.java
--- a/src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/RepairPublishingInfo.java Thu Sep 13 13:41:32 2012 +0200
+++ b/src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/RepairPublishingInfo.java Mon Sep 17 10:21:04 2012 +0200
@@ -33,7 +33,7 @@
Logger logger = Logger.getRootLogger();
logger.setLevel(Level.DEBUG);
EScidocBasicHandler connector = new EScidocBasicHandler(
- "escidoc.mpiwg-berlin.mpg.de", 8080, "dwinter", "fl0rian");
+ "escidoc.mpiwg-berlin.mpg.de", 8080, "dwinter", "XXXX");
if(args.length<2){
System.out.println("Usage: startrecord maximumrecords");
diff -r 94ea06e32003 -r e0efd3a9d2f0 src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/RepairPublishingInfoOrder.java
--- a/src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/RepairPublishingInfoOrder.java Thu Sep 13 13:41:32 2012 +0200
+++ b/src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/RepairPublishingInfoOrder.java Mon Sep 17 10:21:04 2012 +0200
@@ -33,7 +33,7 @@
Logger logger = Logger.getRootLogger();
logger.setLevel(Level.DEBUG);
EScidocBasicHandler connector = new EScidocBasicHandler(
- "escidoc.mpiwg-berlin.mpg.de", 8080, "dwinter", "fl0rian");
+ "escidoc.mpiwg-berlin.mpg.de", 8080, "dwinter", "XXXX");
if(args.length<2){
System.out.println("Usage: startrecord maximumrecords");
diff -r 94ea06e32003 -r e0efd3a9d2f0 src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/RepairPublishingInfoPlace.java
--- a/src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/RepairPublishingInfoPlace.java Thu Sep 13 13:41:32 2012 +0200
+++ b/src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/RepairPublishingInfoPlace.java Mon Sep 17 10:21:04 2012 +0200
@@ -33,7 +33,7 @@
Logger logger = Logger.getRootLogger();
logger.setLevel(Level.DEBUG);
EScidocBasicHandler connector = new EScidocBasicHandler(
- "escidoc.mpiwg-berlin.mpg.de", 8080, "dwinter", "fl0rian");
+ "escidoc.mpiwg-berlin.mpg.de", 8080, "dwinter", "XXXX");
if(args.length<2){
System.out.println("Usage: startrecord maximumrecords");
diff -r 94ea06e32003 -r e0efd3a9d2f0 src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/RepairPublishingInfoPlaceMain.java
--- a/src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/RepairPublishingInfoPlaceMain.java Thu Sep 13 13:41:32 2012 +0200
+++ b/src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/RepairPublishingInfoPlaceMain.java Mon Sep 17 10:21:04 2012 +0200
@@ -33,7 +33,7 @@
Logger logger = Logger.getRootLogger();
logger.setLevel(Level.DEBUG);
EScidocBasicHandler connector = new EScidocBasicHandler(
- "escidoc.mpiwg-berlin.mpg.de", 8080, "dwinter", "fl0rian");
+ "escidoc.mpiwg-berlin.mpg.de", 8080, "dwinter", "XXX");
if(args.length<2){
System.out.println("Usage: startrecord maximumrecords");
diff -r 94ea06e32003 -r e0efd3a9d2f0 src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/ReplaceConeIds.java
--- a/src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/ReplaceConeIds.java Thu Sep 13 13:41:32 2012 +0200
+++ b/src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/ReplaceConeIds.java Mon Sep 17 10:21:04 2012 +0200
@@ -32,7 +32,7 @@
Logger logger = Logger.getRootLogger();
logger.setLevel(Level.DEBUG);
EScidocBasicHandler connector = new EScidocBasicHandler(
- "escidoc.mpiwg-berlin.mpg.de", 8080, "dwinter", "fl0rian");
+ "escidoc.mpiwg-berlin.mpg.de", 8080, "dwinter", "XXX");
if(args.length<2){
System.out.println("Usage: startrecord maximumrecords");
diff -r 94ea06e32003 -r e0efd3a9d2f0 src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/ReplaceLanguage.java
--- a/src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/ReplaceLanguage.java Thu Sep 13 13:41:32 2012 +0200
+++ b/src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/ReplaceLanguage.java Mon Sep 17 10:21:04 2012 +0200
@@ -59,7 +59,7 @@
Logger logger = Logger.getRootLogger();
logger.setLevel(Level.DEBUG);
EScidocBasicHandler connector = new EScidocBasicHandler(
- "escidoc.mpiwg-berlin.mpg.de", 8080, "dwinter", "fl0rian");
+ "escidoc.mpiwg-berlin.mpg.de", 8080, "dwinter", "XXX");
if(args.length<2){
System.out.println("Usage: startrecord maximumrecords");
diff -r 94ea06e32003 -r e0efd3a9d2f0 src/de/mpiwg/itgroup/eSciDoc/Tools/SendFileToeSciDoc.java
--- a/src/de/mpiwg/itgroup/eSciDoc/Tools/SendFileToeSciDoc.java Thu Sep 13 13:41:32 2012 +0200
+++ b/src/de/mpiwg/itgroup/eSciDoc/Tools/SendFileToeSciDoc.java Mon Sep 17 10:21:04 2012 +0200
@@ -14,7 +14,8 @@
//private static final String ESCIDOC_SERVER = "xserve07.mpiwg-berlin.mpg.de";
- private static final String ESCIDOC_SERVER = "escidoc.mpiwg-berlin.mpg.de";
+ //private static final String ESCIDOC_SERVER = "escidoc.mpiwg-berlin.mpg.de";
+ private static final String ESCIDOC_SERVER = "escidoc-mpiwg.rz-berlin.mpg.de";
//private static final String ESCIDOC_SERVER = "escidoc-test.mpiwg-berlin.mpg.de";
/**
diff -r 94ea06e32003 -r e0efd3a9d2f0 src/de/mpiwg/itgroup/eSciDoc/config/echo.properties
--- a/src/de/mpiwg/itgroup/eSciDoc/config/echo.properties Thu Sep 13 13:41:32 2012 +0200
+++ b/src/de/mpiwg/itgroup/eSciDoc/config/echo.properties Mon Sep 17 10:21:04 2012 +0200
@@ -1,3 +1,3 @@
-textServletUrl=http://nausikaa2.mpiwg-berlin.mpg.de/digitallibrary/servlet/Texter?fn=
-dirInfoUrl=http://nausikaa2.mpiwg-berlin.mpg.de/digitallibrary/dirInfo-xml.jsp?fn=
-metaDataManager=http://localhost:8180/MetaDataManagerRestlet
\ No newline at end of file
+textServletUrl=http://digilib.mpiwg-berlin.mpg.de/digitallibrary/servlet/Texter?fn=
+dirInfoUrl=http://digilib.mpiwg-berlin.mpg.de/digitallibrary/dirInfo-xml.jsp?fn=
+metaDataManager=http://localhost:8280/MetaDataManagerRestlet
\ No newline at end of file
diff -r 94ea06e32003 -r e0efd3a9d2f0 src/de/mpiwg/itgroup/eSciDoc/foxridge/FoxridgeRessource.java
--- a/src/de/mpiwg/itgroup/eSciDoc/foxridge/FoxridgeRessource.java Thu Sep 13 13:41:32 2012 +0200
+++ b/src/de/mpiwg/itgroup/eSciDoc/foxridge/FoxridgeRessource.java Mon Sep 17 10:21:04 2012 +0200
@@ -12,14 +12,14 @@
public FoxridgeRessource() throws IOException {
super();
- CMM ="/cmm/content-model/escidoc:131281";
+ CMM ="/cmm/content-model/mpiwg:3";
// TODO Auto-generated constructor stub
}
public FoxridgeRessource(String name, String absolutePath, String string) throws IOException {
super(name, absolutePath, string);
- CMM ="/cmm/content-model/escidoc:131281";
+ CMM ="/cmm/content-model/mpiwg:3";
}
}
diff -r 94ea06e32003 -r e0efd3a9d2f0 src/de/mpiwg/itgroup/eSciDoc/harvesting/FoxridgeHarvester.java
--- a/src/de/mpiwg/itgroup/eSciDoc/harvesting/FoxridgeHarvester.java Thu Sep 13 13:41:32 2012 +0200
+++ b/src/de/mpiwg/itgroup/eSciDoc/harvesting/FoxridgeHarvester.java Mon Sep 17 10:21:04 2012 +0200
@@ -48,7 +48,7 @@
//while (sd.hasNext()){
// System.out.println(sd.next());
//}
- EScidocBasicHandler connector = new EScidocBasicHandler("escidoc.mpiwg-berlin.mpg.de",8080,username,pw);
+ EScidocBasicHandler connector = new EScidocBasicHandler("escidoc-mpiwg.rz-berlin.mpg.de",8080,username,pw);
//ESciDocDataHarvester hv = new ESciDocDataHarvester(new FoxridgeImporter(new File("/Volumes/online_permanent/")),
// new ECHOTransformer(),connector,"/ir/context/escidoc:12001");
@@ -62,7 +62,7 @@
//hv.releaseAndSubmitObjects("/ir/context/escidoc:12001");
//hv.releaseAndSubmitObjects(context+"/resources/members","//escidocItem:item","added esidoc test id",0);
- hv.releaseAndSubmitObjects(context+"/resources/members","//escidocItem:item","added esidoc test id",1);
+ hv.releaseAndSubmitObjects(context+"/resources/members","//escidocItem:item","first run",1);
}
diff -r 94ea06e32003 -r e0efd3a9d2f0 src/de/mpiwg/itgroup/eSciDoc/xmlTemplates/ECHOCollectionTemplate.xml
--- a/src/de/mpiwg/itgroup/eSciDoc/xmlTemplates/ECHOCollectionTemplate.xml Thu Sep 13 13:41:32 2012 +0200
+++ b/src/de/mpiwg/itgroup/eSciDoc/xmlTemplates/ECHOCollectionTemplate.xml Mon Sep 17 10:21:04 2012 +0200
@@ -5,7 +5,7 @@
contains meta data within DC format.
-->
-
-
+
+
PID