perfsonar-dev - perfsonar: r5124 - in branches/new-structure-with-base2/ps-mdm-ls: . ant src/main/java/org/perfsonar/service/lookupservice/registration
Subject: perfsonar development work
List archive
perfsonar: r5124 - in branches/new-structure-with-base2/ps-mdm-ls: . ant src/main/java/org/perfsonar/service/lookupservice/registration
Chronological Thread
- From:
- To:
- Subject: perfsonar: r5124 - in branches/new-structure-with-base2/ps-mdm-ls: . ant src/main/java/org/perfsonar/service/lookupservice/registration
- Date: Wed, 6 May 2009 04:10:04 -0400
Author: trzaszcz
Date: 2009-05-06 04:10:04 -0400 (Wed, 06 May 2009)
New Revision: 5124
Modified:
branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml
branches/new-structure-with-base2/ps-mdm-ls/pom.xml
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LSSummaryRegisterDataSource.java
Log:
lib dependencies improved
Modified: branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml 2009-05-05
13:02:17 UTC (rev 5123)
+++ branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml 2009-05-06
08:10:04 UTC (rev 5124)
@@ -82,19 +82,9 @@
<dependency groupId="perfsonar"
artifactId="ps-mdm-base2" version="0.0.4"/>
- <dependency groupId="rrdjtool"
artifactId="rrdjtool" version="1.0"/>
- <dependency groupId="joda-time"
artifactId="joda-time" version="1.4"/>
<dependency groupId="commons-digester"
artifactId="commons-digester" version="2.0"/>
<dependency groupId="org.apache.axis2"
artifactId="axis2-jaxws" version="1.4.1"/>
-
- <!--
- <dependency groupId="perfsonar" artifactId="ps-mdm-base2"
version="0.0.1"/>
- <dependency groupId="commons-digester"
artifactId="commons-digester" version="2.0"/>
- <dependency groupId="org.apache.axis2" artifactId="axis2-jaxws"
version="1.4.1"/>
- <dependency groupId="org.apache.axis2" artifactId="axis2-adb"
version="1.4.1"/>
- -->
-
<localRepository refid="local.repository"/>
<remoteRepository refid="remote.repository"/>
</artifact:dependencies>
Modified: branches/new-structure-with-base2/ps-mdm-ls/pom.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/pom.xml 2009-05-05 13:02:17
UTC (rev 5123)
+++ branches/new-structure-with-base2/ps-mdm-ls/pom.xml 2009-05-06 08:10:04
UTC (rev 5124)
@@ -241,16 +241,6 @@
<version>0.0.4</version>
</dependency>
<dependency>
- <groupId>rrdjtool</groupId>
- <artifactId>rrdjtool</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>2.0</version>
@@ -260,221 +250,7 @@
<artifactId>axis2-jaxws</artifactId>
<version>1.4.1</version>
</dependency>
-
- <!--
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-scripting</artifactId>
- <type>mar</type>
- <version>1.41</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-adb-codegen</artifactId>
- <version>1.4.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-adb</artifactId>
- <version>1.4.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-codegen</artifactId>
- <version>1.4.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-java2wsdl</artifactId>
- <version>1.4.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxbri</artifactId>
- <version>1.4.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxws-api</artifactId>
- <version>1.4.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <version>1.4.1</version>
- <artifactId>axis2-jaxws</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <version>1.4.1</version>
- <artifactId>axis2-jaxws-integration</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <version>1.4.1</version>
- <artifactId>axis2-jibx</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-json</artifactId>
- <version>1.4.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>1.4.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-metadata</artifactId>
- <version>1.4.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-mtompolicy</artifactId>
- <version>1.4.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-saaj-api</artifactId>
- <version>1.4.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-saaj</artifactId>
- <version>1.4.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-spring</artifactId>
- <version>1.4.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-xmlbeans</artifactId>
- <version>1.4.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>1.4.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- -->
<!-- got for auth -->
<dependency>
<groupId>opensaml</groupId>
Modified:
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LSSummaryRegisterDataSource.java
===================================================================
---
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LSSummaryRegisterDataSource.java
2009-05-05 13:02:17 UTC (rev 5123)
+++
branches/new-structure-with-base2/ps-mdm-ls/src/main/java/org/perfsonar/service/lookupservice/registration/LSSummaryRegisterDataSource.java
2009-05-06 08:10:04 UTC (rev 5124)
@@ -147,11 +147,8 @@
Map<String, ServiceSummary> summaries = new HashMap<String,
ServiceSummary>();
- logger.debug("1");
String[] ipResults = queryIpResults();
- logger.debug("2");
String[] domainResults = queryDomainResults();
- logger.debug("3");
String[] eventTypeResults = queryEventTypeResults();
String[] keywordResults = queryKeywordResults();
- perfsonar: r5124 - in branches/new-structure-with-base2/ps-mdm-ls: . ant src/main/java/org/perfsonar/service/lookupservice/registration, svnlog, 05/06/2009
Archive powered by MHonArc 2.6.16.