Mercurial > hg > eSciDocImport

changeset 15:e0efd3a9d2f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changes for escidoc1.4
author dwinter
date Mon, 17 Sep 2012 10:21:04 +0200
parents 94ea06e32003
children da598103dd22
files .classpath libs/escidoc-ijc-1.3.3.jar libs/escidoc-ijc-1.4.2.jar src/de/mpiwg/itgroup/eSciDoc/Tools/DRI/CreateDRIList.java src/de/mpiwg/itgroup/eSciDoc/Tools/EScidocBasicHandler.java src/de/mpiwg/itgroup/eSciDoc/Tools/EScidocTools.java src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/PubmanFoxridgeIdentifierRelationModell.java src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/RepairPublishingInfo.java src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/RepairPublishingInfoOrder.java src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/RepairPublishingInfoPlace.java src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/RepairPublishingInfoPlaceMain.java src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/ReplaceConeIds.java src/de/mpiwg/itgroup/eSciDoc/Tools/Pubman/ReplaceLanguage.java src/de/mpiwg/itgroup/eSciDoc/Tools/SendFileToeSciDoc.java src/de/mpiwg/itgroup/eSciDoc/config/echo.properties src/de/mpiwg/itgroup/eSciDoc/foxridge/FoxridgeRessource.java src/de/mpiwg/itgroup/eSciDoc/harvesting/FoxridgeHarvester.java src/de/mpiwg/itgroup/eSciDoc/xmlTemplates/ECHOCollectionTemplate.xml src/de/mpiwg/itgroup/eSciDoc/xmlTemplates/ECHOResourceTemplate.xml
diffstat 19 files changed, 86 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/.classpath	Thu Sep 13 13:41:32 2012 +0200
+++ b/.classpath	Mon Sep 17 10:21:04 2012 +0200
@@ -12,6 +12,7 @@
 	<classpathentry kind="lib" path="libs/ws-commons-util-1.0.2.jar"/>
 	<classpathentry kind="lib" path="libs/httpclient-4.0.1.jar"/>
 	<classpathentry kind="lib" path="libs/httpcore-4.0.1.jar"/>
+	<classpathentry kind="lib" path="libs/escidoc-ijc-1.3.3.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/MetaDataManager"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
Binary file libs/escidoc-ijc-1.3.3.jar has changed
Binary file libs/escidoc-ijc-1.4.2.jar has changed
--- 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");	
 	}	
 
 
--- 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<NameValuePair> nameValuePairs = new ArrayList<NameValuePair>(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;
 		}
 	   
--- 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";
--- 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];
--- 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");
--- 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");
--- 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");
--- 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");
--- 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");
--- 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");
--- 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";
 
 	/**
--- 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
--- 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";
 	}
 
 }
--- 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);
 		
 
 	}
--- 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.
 -->
 <escidocItem:item 
-	xmlns:escidocItem="http://www.escidoc.de/schemas/item/0.9"
+	xmlns:escidocItem="http://www.escidoc.de/schemas/item/0.10"
 	xmlns:escidocMetadataRecords="http://www.escidoc.de/schemas/metadatarecords/0.5"
 	xmlns:escidocComponents="http://www.escidoc.de/schemas/components/0.9"
 	xmlns:prop="http://escidoc.de/core/01/properties/"
--- a/src/de/mpiwg/itgroup/eSciDoc/xmlTemplates/ECHOResourceTemplate.xml	Thu Sep 13 13:41:32 2012 +0200
+++ b/src/de/mpiwg/itgroup/eSciDoc/xmlTemplates/ECHOResourceTemplate.xml	Mon Sep 17 10:21:04 2012 +0200
@@ -5,7 +5,7 @@
 	contains meta data within DC format.
 -->
 <escidocItem:item 
-	xmlns:escidocItem="http://www.escidoc.de/schemas/item/0.9"
+	xmlns:escidocItem="http://www.escidoc.de/schemas/item/0.10"
 	xmlns:escidocMetadataRecords="http://www.escidoc.de/schemas/metadatarecords/0.5"
 	xmlns:escidocComponents="http://www.escidoc.de/schemas/components/0.9"
 	xmlns:prop="http://escidoc.de/core/01/properties/"
@@ -15,8 +15,8 @@
 	xmlns:xlink="http://www.w3.org/1999/xlink">
 
 	<escidocItem:properties>
-		<srel:context xlink:href="/ir/context/escidoc:1001" />
-		<srel:content-model xlink:href="/cmm/content-model/escidoc:3001"/>
+		<srel:context xlink:href="/ir/context/mpiwg:2" />
+		<srel:content-model xlink:href="/cmm/content-model/mpiwg:3"/>
 		<prop:pid >PID</prop:pid>
 		<prop:content-model-specific>
 			<cms-prop test="1" />