perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r5890 - in trunk/perfsonar-java-base2: . src/main/java/org/perfsonar/base2/service/configuration src/main/java/org/perfsonar/base2/service/scheduler src/main/java/org/perfsonar/base2/servlets
Subject: perfsonar development work
List archive
[pS-dev] [GEANT/SA2/ps-java-services] r5890 - in trunk/perfsonar-java-base2: . src/main/java/org/perfsonar/base2/service/configuration src/main/java/org/perfsonar/base2/service/scheduler src/main/java/org/perfsonar/base2/servlets
Chronological Thread
- From:
- To:
- Subject: [pS-dev] [GEANT/SA2/ps-java-services] r5890 - in trunk/perfsonar-java-base2: . src/main/java/org/perfsonar/base2/service/configuration src/main/java/org/perfsonar/base2/service/scheduler src/main/java/org/perfsonar/base2/servlets
- Date: Sat, 4 Feb 2012 17:30:45 +0000 (GMT)
Author: dante.delvaux
Date: 2012-02-04 17:30:45 +0000 (Sat, 04 Feb 2012)
New Revision: 5890
Modified:
trunk/perfsonar-java-base2/
trunk/perfsonar-java-base2/pom.xml
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/ConfigurationManager.java
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/scheduler/SchedulingComponent.java
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/servlets/ExistDBInitServlet.java
Log:
Updating some JAR dependencies, most noticeable is the eXist library that is
now 1.2.6. Refs PSSERVICES-572.
Bumping pS-base2 version to 1.0.6.
Property changes on: trunk/perfsonar-java-base2
___________________________________________________________________
Added: svn:ignore
+ .settings
build
.classpath
.project
Modified: trunk/perfsonar-java-base2/pom.xml
===================================================================
--- trunk/perfsonar-java-base2/pom.xml 2012-01-24 16:35:01 UTC (rev 5889)
+++ trunk/perfsonar-java-base2/pom.xml 2012-02-04 17:30:45 UTC (rev 5890)
@@ -8,7 +8,7 @@
<artifactId>ps-mdm-base2</artifactId>
<packaging>jar</packaging>
<name>Perfsonar Base2 package</name>
- <version>1.0.5</version>
+ <version>1.0.6</version>
<description>
The perfSONAR base provides a number of common, shared classes which
can be used by
MA, MP and Clients.
@@ -82,6 +82,7 @@
<source>1.6</source>
<target>1.6</target>
</configuration>
+ <version>2.3.2</version>
</plugin>
</plugins>
</build>
@@ -124,21 +125,11 @@
<!-- got for auth -->
<dependency>
- <groupId>opensaml</groupId>
- <artifactId>opensaml1</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
<version>124</version>
</dependency>
<dependency>
- <groupId>xml-security</groupId>
- <artifactId>xmlsec</artifactId>
- <version>1.3.0</version>
- </dependency>
- <dependency>
<groupId>edugain</groupId>
<artifactId>edugain</artifactId>
<version>1.0-RC2</version>
@@ -159,16 +150,6 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>opensaml</groupId>
- <artifactId>opensaml</artifactId>
- <version>2.2.3</version>
- </dependency>
- <dependency>
<groupId>xmltooling</groupId>
<artifactId>xmltooling</artifactId>
<version>1.2.0</version>
@@ -182,6 +163,20 @@
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-core</artifactId>
<version>1.4</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>opensaml</artifactId>
+ <groupId>opensaml</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>bcprov-jdk13</artifactId>
+ <groupId>bouncycastle</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xmlsec</artifactId>
+
<groupId>org.apache.santuario</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>xerces</groupId>
@@ -214,31 +209,37 @@
<version>1.3</version>
</dependency>
-
- <!-- ExistDB initalizer -->
-
<dependency>
<groupId>xmldb</groupId>
<artifactId>xmldb-api</artifactId>
- <version>20021118</version>
+ <version>exist-1.2.6</version>
</dependency>
<dependency>
- <groupId>exist</groupId>
- <artifactId>exist-db</artifactId>
- <version>1.0rc</version>
+ <artifactId>xmlrpc-client</artifactId>
+ <groupId>org.apache.xmlrpc</groupId>
+ <version>3.0</version>
</dependency>
+
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
<groupId>exist</groupId>
- <artifactId>exist-xmlrpc</artifactId>
- <version>1.0rc</version>
+ <artifactId>exist</artifactId>
+ <version>1.2.6</version>
</dependency>
<dependency>
- <artifactId>xmlrpc-client</artifactId>
- <groupId>org.apache.xmlrpc</groupId>
- <version>3.0</version>
+ <groupId>org.apache.santuario</groupId>
+ <artifactId>xmlsec</artifactId>
+ <version>1.4.6</version>
</dependency>
-
-
</dependencies>
@@ -262,16 +263,20 @@
</reports>
</reportSet>
</reportSets>
+ <version>version</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>version</version>
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
+ <version>version</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
+ <version>version</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -279,6 +284,7 @@
<configuration>
<failOnViolation>false</failOnViolation>
</configuration>
+ <version>version</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -289,6 +295,7 @@
<minimumTokens>100</minimumTokens>
<targetJdk>1.5</targetJdk>
</configuration>
+ <version>version</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -314,4 +321,8 @@
<uniqueVersion>false</uniqueVersion>
</repository>
</distributionManagement>
+ <properties>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>
</project>
Modified:
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/ConfigurationManager.java
===================================================================
---
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/ConfigurationManager.java
2012-01-24 16:35:01 UTC (rev 5889)
+++
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/ConfigurationManager.java
2012-02-04 17:30:45 UTC (rev 5890)
@@ -66,7 +66,7 @@
/**
- * initializes the instance of configuration manager and invokes run
method on components (scheduler are activated)
+ * Initializes the instance of configuration manager and invokes run
method on components (scheduler is activated)
*
*
* @return an instance of ConfigurationManager
@@ -78,7 +78,7 @@
/**
*
- * initialize the instance of configuration manager without invoking run
method on created components (scheduler are disactivated)
+ * Initializes the instance of configuration manager without invoking
run method on created components (scheduler is deactivated)
*
* @return an instance of ConfigurationManager
* @throws PerfSONARExceptiona
Modified:
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/scheduler/SchedulingComponent.java
===================================================================
---
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/scheduler/SchedulingComponent.java
2012-01-24 16:35:01 UTC (rev 5889)
+++
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/scheduler/SchedulingComponent.java
2012-02-04 17:30:45 UTC (rev 5890)
@@ -54,7 +54,7 @@
*/
protected void loadSettings() throws PerfSONARException {
- logger.debug("SchedulingComponenet - loading configuration");
+ logger.debug("SchedulingComponent - loading configuration");
//get classname
schedulerClassName = getOption("schedulerClassName").getValue();
Modified:
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/servlets/ExistDBInitServlet.java
===================================================================
---
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/servlets/ExistDBInitServlet.java
2012-01-24 16:35:01 UTC (rev 5889)
+++
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/servlets/ExistDBInitServlet.java
2012-02-04 17:30:45 UTC (rev 5890)
@@ -2,6 +2,7 @@
import java.io.File;
+import org.apache.log4j.Logger;
import org.exist.security.User;
import org.exist.xmldb.UserManagementService;
import org.xmldb.api.DatabaseManager;
@@ -21,6 +22,8 @@
@SuppressWarnings("serial")
public abstract class ExistDBInitServlet extends AuthServlet {
+ private Logger logger = Logger.getLogger(ExistDBInitServlet.class);
+
/**
*
* upload file to eXistDatabase
@@ -44,13 +47,18 @@
collection.storeResource(document);
}
- @SuppressWarnings("unchecked")
protected Collection getMainCollection(String dbUrl) {
try {
+ @SuppressWarnings("rawtypes")
Class cl =
Class.forName("org.exist.xmldb.DatabaseImpl");
Database database = (Database) cl.newInstance();
+// database.setProperty("create-database", "true");
+ logger.debug("••• Connecting to eXist DB as \"" +
getUsername() + "\" •••");
DatabaseManager.registerDatabase(database);
- Collection collection =
DatabaseManager.getCollection(dbUrl,getUsername(), getPassword());
+ Collection collection =
DatabaseManager.getCollection(dbUrl, getUsername(), getPassword());
+ if (collection == null) {
+ logger.warn("Something went wrong in
getMainCollection!");
+ }
return collection;
} catch (ClassNotFoundException e) {
e.printStackTrace();
- [pS-dev] [GEANT/SA2/ps-java-services] r5890 - in trunk/perfsonar-java-base2: . src/main/java/org/perfsonar/base2/service/configuration src/main/java/org/perfsonar/base2/service/scheduler src/main/java/org/perfsonar/base2/servlets, svn-noreply, 02/04/2012
Archive powered by MHonArc 2.6.16.