Skip to Content.
Sympa Menu

perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r6080 - in trunk: . parent perfsonar-java-web-admin perfsonar- java-web-admin/perfsonar-java-web-admin-component perfsona r-java-web-admin/perfsonar-java-web-admin-component/src/ma in/webapp/WEB-INF perfsonar-java-web-admin/perfsonar-java- web-admin-exampleservice/src/main/webapp/WEB-INF perfsonar -java-xml-ls perfsonar-java-xml-ls/src/main/webapp/WEB-INF

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/ps-java-services] r6080 - in trunk: . parent perfsonar-java-web-admin perfsonar- java-web-admin/perfsonar-java-web-admin-component perfsona r-java-web-admin/perfsonar-java-web-admin-component/src/ma in/webapp/WEB-INF perfsonar-java-web-admin/perfsonar-java- web-admin-exampleservice/src/main/webapp/WEB-INF perfsonar -java-xml-ls perfsonar-java-xml-ls/src/main/webapp/WEB-INF


Chronological Thread 
  • From:
  • To:
  • Subject: [pS-dev] [GEANT/SA2/ps-java-services] r6080 - in trunk: . parent perfsonar-java-web-admin perfsonar- java-web-admin/perfsonar-java-web-admin-component perfsona r-java-web-admin/perfsonar-java-web-admin-component/src/ma in/webapp/WEB-INF perfsonar-java-web-admin/perfsonar-java- web-admin-exampleservice/src/main/webapp/WEB-INF perfsonar -java-xml-ls perfsonar-java-xml-ls/src/main/webapp/WEB-INF
  • Date: Fri, 28 Dec 2012 19:27:21 +0000 (GMT)
Author: dante.delvaux
Date: 2012-12-28 19:27:21 +0000 (Fri, 28 Dec 2012)
New Revision: 6080

Modified:
trunk/parent/pom.xml
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/pom.xml

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/WEB-INF/web.xml

trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/webapp/WEB-INF/web.xml
trunk/perfsonar-java-web-admin/pom.xml
trunk/perfsonar-java-xml-ls/pom.xml
trunk/perfsonar-java-xml-ls/src/main/webapp/WEB-INF/web.xml
trunk/pom.xml
Log:
Integrating perfsonar-java-web-admin into the mvn aggregator.
Correcting minor servlet schema issue.


Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml 2012-12-27 18:40:41 UTC (rev 6079)
+++ trunk/parent/pom.xml 2012-12-28 19:27:21 UTC (rev 6080)
@@ -99,6 +99,12 @@

<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/pom.xml
===================================================================
--- trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/pom.xml
2012-12-27 18:40:41 UTC (rev 6079)
+++ trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/pom.xml
2012-12-28 19:27:21 UTC (rev 6080)
@@ -14,10 +14,6 @@

<properties>
<junit.version>4.8.1</junit.version>
- <user.language>en</user.language>
- <user.region>GB</user.region>
- <user.country>US</user.country>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<build>
@@ -77,12 +73,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.1</version>
- <configuration>
-
<source>${project.build.javaSource}</source>
-
<target>${project.build.javaTarget}</target>
-
<encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
</plugin>

<plugin>

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/WEB-INF/web.xml
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/WEB-INF/web.xml
2012-12-27 18:40:41 UTC (rev 6079)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/src/main/webapp/WEB-INF/web.xml
2012-12-28 19:27:21 UTC (rev 6080)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd";
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";
version="2.5">

<display-name>perfSONAR Web Admin</display-name>

Modified:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/webapp/WEB-INF/web.xml
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/webapp/WEB-INF/web.xml
2012-12-27 18:40:41 UTC (rev 6079)
+++
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/webapp/WEB-INF/web.xml
2012-12-28 19:27:21 UTC (rev 6080)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd";
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";
version="2.5">

<display-name>perfSONAR Web Admin</display-name>

Modified: trunk/perfsonar-java-web-admin/pom.xml
===================================================================
--- trunk/perfsonar-java-web-admin/pom.xml 2012-12-27 18:40:41 UTC (rev
6079)
+++ trunk/perfsonar-java-web-admin/pom.xml 2012-12-28 19:27:21 UTC (rev
6080)
@@ -1,33 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <parent>
+ <groupId>net.geant.perfsonar</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
- <groupId>net.geant.perfsonar</groupId>
<artifactId>web-admin</artifactId>
<version>1.1-SNAPSHOT</version>
<packaging>pom</packaging>
+
<name>perfSONAR Web Admin</name>
- <url>http://www.perfsonar.net/</url>
+ <description>The perfSONAR Web Admin is meant to provide uniform look
and feel to all perfSONAR services developed in Java.

+The perfsonar-java-web-admin-exampleservice shows how one can integrate the
Web Admin with an existing perfSONAR service.</description>
+
<modules>
<module>perfsonar-java-web-admin-component</module>
<module>perfsonar-java-web-admin-exampleservice</module>
</modules>

- <description>The perfSONAR Web Admin is meant to provide uniform look
and feel to all perfSONAR services developed in Java.
-
-The perfsonar-java-web-admin-exampleservice shows how one can integrate the
Web Admin with an existing perfSONAR service.</description>
-
<issueManagement>
<system>JIRA</system>

<url>https://issues.geant.net/jira/browse/PSSERVICES/component/10679</url>
</issueManagement>

- <organization>
- <name>GÉANT</name>
- <url>http://www.geant.net/</url>
- </organization>
-
<developers>
<developer>
<id>wiku</id>
@@ -52,9 +52,6 @@
</developers>

<properties>
-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.build.javaSource>1.6</project.build.javaSource>
- <project.build.javaTarget>1.6</project.build.javaTarget>
<log4j.version>1.2.17</log4j.version>
</properties>

@@ -64,15 +61,10 @@
<plugin>

<groupId>org.apache.maven.plugins</groupId>

<artifactId>maven-resources-plugin</artifactId>
- <version>2.4.2</version>
- <configuration>
-
<encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
</plugin>
<plugin>

<groupId>org.apache.maven.plugins</groupId>

<artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
</plugin>
<plugin>

<groupId>org.apache.tomcat.maven</groupId>
@@ -123,35 +115,4 @@
</dependencies>
</dependencyManagement>

- <repositories>
- <repository>
- <id>ibiblio</id>
- <name>ibiblio repository</name>
- <url>http://www.ibiblio.org/maven2</url>
- </repository>
- <repository>
- <id>geant-repository</id>
- <name>GEANT repository</name>
-
<url>https://artifactory.geant.net/artifactory/geant-repo/</url>
- </repository>
- <repository>
- <id>geant-repository-3rdparty</id>
- <name>GEANT repository 3rd party products</name>
-
<url>https://artifactory.geant.net/artifactory/geant-repo/net/geant/3rdparty</url>
- </repository>
- </repositories>
-
- <distributionManagement>
- <repository>
- <id>GEANT Artifactory</id>
- <name>GEANT Artifactory perfSONAR-release</name>
-
<url>https://artifactory.geant.net/artifactory/perfsonar-release-local</url>
- </repository>
- <snapshotRepository>
- <id>GEANT Artifactory</id>
- <name>GEANT Artifactory perfSONAR-snapshots</name>
-
<url>https://artifactory.geant.net/artifactory/perfsonar-snapshot-local</url>
- </snapshotRepository>
- </distributionManagement>
-
</project>

Modified: trunk/perfsonar-java-xml-ls/pom.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/pom.xml 2012-12-27 18:40:41 UTC (rev 6079)
+++ trunk/perfsonar-java-xml-ls/pom.xml 2012-12-28 19:27:21 UTC (rev 6080)
@@ -41,14 +41,12 @@
<configurationFile>log4j.xml</configurationFile>
<axis2Id>axis2-1.4.1</axis2Id>
<packageName>perfsonar-java-xml-ls</packageName>
-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<log4j.version>1.2.17</log4j.version>
<exist.version>1.2.6</exist.version>
<xmlrpc.version>3.1.2</xmlrpc.version>
<junit.version>4.8.1</junit.version>
<datadir>data</datadir>
<port>8080</port>
- <maven-compiler-plugin.source>1.6</maven-compiler-plugin.source>
</properties>

<build>
@@ -260,30 +258,6 @@
</resources>
</build>

-<!--
- <repositories>
- <repository>
- <id>ibiblio</id>
- <name>ibiblio repository</name>
-
<url>http://mirrors.ibiblio.org/pub/mirrors/maven2/</url>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>Apache Snapshots</name>
-
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- -->
-
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
@@ -310,8 +284,8 @@

<dependency>
<groupId>net.geant.perfsonar</groupId>
- <artifactId>ps-mdm-base2</artifactId>
- <version>1.0.7-SNAPSHOT</version>
+ <artifactId>perfsonar-java-base2</artifactId>
+ <version>1.1-SNAPSHOT</version>
<exclusions>
<exclusion>
<artifactId>exist</artifactId>

Modified: trunk/perfsonar-java-xml-ls/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/perfsonar-java-xml-ls/src/main/webapp/WEB-INF/web.xml 2012-12-27
18:40:41 UTC (rev 6079)
+++ trunk/perfsonar-java-xml-ls/src/main/webapp/WEB-INF/web.xml 2012-12-28
19:27:21 UTC (rev 6080)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd";
+<web-app xmlns="http://java.sun.com/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";
version="2.5">

<display-name>GEANT XML LS</display-name>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-12-27 18:40:41 UTC (rev 6079)
+++ trunk/pom.xml 2012-12-28 19:27:21 UTC (rev 6080)
@@ -32,6 +32,7 @@
<module>perfsonar-java-base2</module>
<module>perfsonar-java-rrd-ma-SQL_backend</module>
<module>perfsonar-java-xml-ls</module>
+ <module>perfsonar-java-web-admin</module>
<module>nmwg-sql-converter</module>
</modules>
</project>


  • [pS-dev] [GEANT/SA2/ps-java-services] r6080 - in trunk: . parent perfsonar-java-web-admin perfsonar- java-web-admin/perfsonar-java-web-admin-component perfsona r-java-web-admin/perfsonar-java-web-admin-component/src/ma in/webapp/WEB-INF perfsonar-java-web-admin/perfsonar-java- web-admin-exampleservice/src/main/webapp/WEB-INF perfsonar -java-xml-ls perfsonar-java-xml-ls/src/main/webapp/WEB-INF, svn-noreply, 12/28/2012

Archive powered by MHonArc 2.6.16.

Top of Page