deleted sysos

oaipmh-core/pom.xml

@@ -38,27 +38,17 @@
 			<artifactId>cxf-rt-frontend-jaxws</artifactId>
 			<version>${cxf.version}</version>
 		</dependency>
-		<dependency> 
-			<groupId>org.apache.cxf</groupId> 
-			<artifactId>cxf-rt-transports-http</artifactId> 
-			<version>${cxf.version}</version> 
-	        </dependency>
-		<!--dependency>
-			<groupId>javax.ws.rs</groupId>
-			<artifactId>jsr311-api</artifactId>
-			<version>1.0</version>
-		</dependency-->
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-rt-transports-http</artifactId>
+			<version>${cxf.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<!--dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
-			<version>2.1</version>
-		</dependency-->
 		<dependency>
 			<groupId>org.elasticsearch</groupId>
 			<artifactId>elasticsearch</artifactId>
@@ -96,17 +86,11 @@
 			<artifactId>metsModsMapping</artifactId>
 			<version>1.0</version>
 		</dependency>
-		<!--dependency> 
-			<groupId>org.apache.jena</groupId> 
-			<artifactId>jena-core</artifactId> 
-			<version>3.4.0</version> 
-		</dependency--> 
-		<!-- dependency> 
-			<groupId>org.apache.jena</groupId> 
-			<artifactId>jena-arq</artifactId> 
-			<version>3.6.0</version>
-		</dependency-->
-
+		<dependency>
+			<groupId>de.shadowhunt.maven.plugins</groupId>
+			<artifactId>package-info-maven-plugin</artifactId>
+			<version>1.4.5</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<pluginManagement>
@@ -170,29 +154,28 @@
 				</executions>
 			</plugin>
 			<plugin>
-<!-- We use this plugin to ensure that our usage of the
-maven-jaxb2-plugin is JDK 8 compatible in absence of a fix
-for https://java.net/jira/browse/MAVEN_JAXB2_PLUGIN-80. -->
-    <groupId>org.codehaus.mojo</groupId>
-    <artifactId>properties-maven-plugin</artifactId>
-    <version>1.0-alpha-2</version>
-    <executions>
-        <execution>
-            <id>set-additional-system-properties</id>
-            <goals>
-                <goal>set-system-properties</goal>
-            </goals>
-        </execution>
-    </executions>
-    <configuration>
-        <properties>
-            <property>
-                <name>javax.xml.accessExternalSchema</name>
-                <value>file,http</value>
-            </property>
-        </properties>
-    </configuration>
-</plugin>
+				<!-- We use this plugin to ensure that our usage of the maven-jaxb2-plugin 
+					is JDK 8 compatible in absence of a fix for https://java.net/jira/browse/MAVEN_JAXB2_PLUGIN-80. -->
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>properties-maven-plugin</artifactId>
+				<version>1.0-alpha-2</version>
+				<executions>
+					<execution>
+						<id>set-additional-system-properties</id>
+						<goals>
+							<goal>set-system-properties</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<properties>
+						<property>
+							<name>javax.xml.accessExternalSchema</name>
+							<value>file,http</value>
+						</property>
+					</properties>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>jaxb2-maven-plugin</artifactId>

oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java

@@ -355,6 +355,7 @@ public class OAIPMHImpl implements OAIPMHProducer {
     
     ErrorHandler requestErrors = RecordListDelivererAbstract.requestChecker(request);
 
+    // System.out.println("DU KOMMST NICHT VORBEI!!!");
     if (requestErrors.getError().getCode() != null) {
       oai.getError().add(requestErrors.getError());
     } else {

oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTextgridOnlineTests.java

@@ -659,18 +659,18 @@ public class OaiPmhTextgridOnlineTests {
 
     // Count response objects at first.
     int recordCount = 0;
-    int i = res.indexOf("<ns2:" + recordOrHeader + ">", 0);
+    int i = res.indexOf("<" + recordOrHeader + ">", 0);
     while (i != -1) {
       recordCount++;
       i++;
-      i = res.indexOf("<ns2:" + recordOrHeader + ">", i);
+      i = res.indexOf("<" + recordOrHeader + ">", i);
     }
 
     System.out.println("\t" + theThreadName + " " + recordOrHeader + "s:  " + recordCount);
 
     // Check if token tag is existing.
-    int tokStart = res.indexOf("<ns2:resumptionToken");
-    int tokEnd = res.indexOf("</ns2:resumptionToken");
+    int tokStart = res.indexOf("<resumptionToken");
+    int tokEnd = res.indexOf("</resumptionToken");
 
     if (tokStart == -1 && tokEnd == -1) {
       System.out.println("\t" + theThreadName + " token:    no token");
@@ -807,6 +807,12 @@ public class OaiPmhTextgridOnlineTests {
       }
     }
 
+    if (loopCount < numberOfPagesToTest) {
+      System.out.println(theThreadName + ERROR + ": " + "Must have done " + numberOfPagesToTest
+          + " loops, but did only " + loopCount);
+      assertTrue(false);
+    }
+
     System.out.println("\t" + theThreadName + OK);
   }
 
@@ -899,4 +905,4 @@ public class OaiPmhTextgridOnlineTests {
 
   }
 
-}
\ No newline at end of file
+}