Skip to Content.
Sympa Menu

perfsonar-dev - [pS-dev] [GEANT/SA2/ps-java-services] r6404 - in trunk/perfsonar-java-web-admin: . web-admin-component web-admin-exampleservice

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/ps-java-services] r6404 - in trunk/perfsonar-java-web-admin: . web-admin-component web-admin-exampleservice


Chronological Thread 
  • From:
  • To:
  • Subject: [pS-dev] [GEANT/SA2/ps-java-services] r6404 - in trunk/perfsonar-java-web-admin: . web-admin-component web-admin-exampleservice
  • Date: Fri, 17 May 2013 21:19:20 +0100 (BST)
  • Authentication-results: sfpop-ironport04.merit.edu; dkim=neutral (message not signed) header.i=none
Author: dante.delvaux
Date: 2013-05-17 21:19:20 +0100 (Fri, 17 May 2013)
New Revision: 6404

Added:
trunk/perfsonar-java-web-admin/web-admin-component/
trunk/perfsonar-java-web-admin/web-admin-component/pom.xml
trunk/perfsonar-java-web-admin/web-admin-exampleservice/
trunk/perfsonar-java-web-admin/web-admin-exampleservice/pom.xml
Removed:
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/
trunk/perfsonar-java-web-admin/web-admin-component/pom.xml
trunk/perfsonar-java-web-admin/web-admin-exampleservice/pom.xml
Log:
WebAdmin: renaming directories as artifactId and vice-versa.

Deleted: trunk/perfsonar-java-web-admin/web-admin-component/pom.xml
===================================================================
--- trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/pom.xml
2013-05-17 20:03:26 UTC (rev 6401)
+++ trunk/perfsonar-java-web-admin/web-admin-component/pom.xml 2013-05-17
20:19:20 UTC (rev 6404)
@@ -1,141 +0,0 @@
-<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/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>web-admin-component</artifactId>
- <packaging>war</packaging>
- <name>perfSONAR Web Admin Component</name>
-
- <parent>
- <groupId>net.geant.perfsonar</groupId>
- <artifactId>web-admin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <build>
- <finalName>${project.artifactId}</finalName>
-
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
- <plugins>
-
- <plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- <version>0.8.2</version>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
-<!--
- TODO: For some reason, pre-compiling JSP files and using WAR
layover doesn't work right
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jspc-maven-plugin</artifactId>
- <version>1.4.6</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
-
<javaEncoding>${project.build.sourceEncoding}</javaEncoding>
-
<inputWebXml>${basedir}/src/main/webapp/WEB-INF/web-overlay.xml</inputWebXml>
-
<outputWebXml>${project.build.directory}/web-overlay.xml</outputWebXml>
- </configuration>
- <executions>
- <execution>
- <id>jspc</id>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <!-- We attach classes in a separate jar
so pS services can extend the BasicServlet -->
- <attachClasses>true</attachClasses>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>run-war</id>
- <!-- We don't want this plugin to be called from
another module build -->
- <phase/>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
-
- </build>
-
- <dependencies>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.1</version>
- </dependency>
-
- </dependencies>
-
-</project>

Copied: trunk/perfsonar-java-web-admin/web-admin-component/pom.xml (from rev
6403,
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-component/pom.xml)
===================================================================
--- trunk/perfsonar-java-web-admin/web-admin-component/pom.xml
(rev 0)
+++ trunk/perfsonar-java-web-admin/web-admin-component/pom.xml 2013-05-17
20:19:20 UTC (rev 6404)
@@ -0,0 +1,144 @@
+<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/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.geant.perfsonar</groupId>
+ <artifactId>perfsonar-java-web-admin</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>web-admin-component</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
+ <packaging>war</packaging>
+
+ <name>perfSONAR Web Admin Component</name>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+
+ <plugin>
+ <groupId>org.jvnet.jaxb2.maven2</groupId>
+ <artifactId>maven-jaxb2-plugin</artifactId>
+ <version>0.8.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+<!--
+ TODO: For some reason, pre-compiling JSP files and using WAR
layover doesn't work right
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jspc-maven-plugin</artifactId>
+ <version>1.4.6</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+
<javaEncoding>${project.build.sourceEncoding}</javaEncoding>
+
<inputWebXml>${basedir}/src/main/webapp/WEB-INF/web-overlay.xml</inputWebXml>
+
<outputWebXml>${project.build.directory}/web-overlay.xml</outputWebXml>
+ </configuration>
+ <executions>
+ <execution>
+ <id>jspc</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ -->
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <!-- We attach classes in a separate jar
so pS services can extend the BasicServlet -->
+ <attachClasses>true</attachClasses>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>run-war</id>
+ <!-- We don't want this plugin to be called from
another module build -->
+ <phase/>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.1</version>
+ </dependency>
+
+ </dependencies>
+
+</project>

Deleted: trunk/perfsonar-java-web-admin/web-admin-exampleservice/pom.xml
===================================================================
---
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/pom.xml
2013-05-17 20:03:26 UTC (rev 6401)
+++ trunk/perfsonar-java-web-admin/web-admin-exampleservice/pom.xml
2013-05-17 20:19:20 UTC (rev 6404)
@@ -1,75 +0,0 @@
-<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/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.geant.perfsonar</groupId>
- <artifactId>web-admin</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
-
- <artifactId>web-admin-exampleservice</artifactId>
- <packaging>war</packaging>
- <name>perfSONAR Web Admin Example Service</name>
- <description>This is a example of how a perfSONAR service project can
add the WebAdmin WAR as an overlay. New servlet and JSP pages can be added
in the service itself.
-
-Servlet can extend the BasicServlet and then have the WebAdmin object map at
finger tips.
-
-JSP pages can be added at the root of the webapp/ directory (and a
corresponding entry in the web.xml) or inside de webapp/views/ directory and
be included in the WebAdmin index.jsp page (using the page parameter). This
last solution make it possible to re-use the same page layout easily (only
providing the JSP code needed to fill the main area of the page).
-</description>
-
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>net.geant.perfsonar</groupId>
- <artifactId>web-admin-component</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <!-- You need to include the web-admin-component jar (classes)
if you want to extend the BasicServlet class -->
- <groupId>net.geant.perfsonar</groupId>
- <artifactId>web-admin-component</artifactId>
- <version>${project.version}</version>
- <classifier>classes</classifier>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>${project.artifactId}</finalName>
-
- <resources>
- <resource>
- <!-- The webAdminConfig.xml must be filtered to have the
name and version filled in -->
- <directory>src/main/resources/perfsonar/conf</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <overlays>
- <overlay>
- <!-- The web-admin-component needs to be used
as a WAR overlay -->
-
<groupId>net.geant.perfsonar</groupId>
-
<artifactId>web-admin-component</artifactId>
- </overlay>
- </overlays>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
-
-</project>

Copied: trunk/perfsonar-java-web-admin/web-admin-exampleservice/pom.xml (from
rev 6403,
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/pom.xml)
===================================================================
--- trunk/perfsonar-java-web-admin/web-admin-exampleservice/pom.xml
(rev 0)
+++ trunk/perfsonar-java-web-admin/web-admin-exampleservice/pom.xml
2013-05-17 20:19:20 UTC (rev 6404)
@@ -0,0 +1,78 @@
+<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/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.geant.perfsonar</groupId>
+ <artifactId>web-admin</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>web-admin-exampleservice</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
+ <packaging>war</packaging>
+
+ <name>perfSONAR Web Admin Example Service</name>
+ <description>This is a example of how a perfSONAR service project can
add the WebAdmin WAR as an overlay. New servlet and JSP pages can be added
in the service itself.
+
+Servlet can extend the BasicServlet and then have the WebAdmin object map at
finger tips.
+
+JSP pages can be added at the root of the webapp/ directory (and a
corresponding entry in the web.xml) or inside de webapp/views/ directory and
be included in the WebAdmin index.jsp page (using the page parameter). This
last solution make it possible to re-use the same page layout easily (only
providing the JSP code needed to fill the main area of the page).
+</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.geant.perfsonar</groupId>
+ <artifactId>web-admin-component</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <!-- You need to include the web-admin-component jar (classes)
if you want to extend the BasicServlet class -->
+ <groupId>net.geant.perfsonar</groupId>
+ <artifactId>web-admin-component</artifactId>
+ <version>${project.version}</version>
+ <classifier>classes</classifier>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+
+ <resources>
+ <resource>
+ <!-- The webAdminConfig.xml must be filtered to have the
name and version filled in -->
+ <directory>src/main/resources/perfsonar/conf</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <overlays>
+ <overlay>
+ <!-- The web-admin-component needs to be used
as a WAR overlay -->
+
<groupId>net.geant.perfsonar</groupId>
+
<artifactId>web-admin-component</artifactId>
+ </overlay>
+ </overlays>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+
+</project>


  • [pS-dev] [GEANT/SA2/ps-java-services] r6404 - in trunk/perfsonar-java-web-admin: . web-admin-component web-admin-exampleservice, svn-noreply, 05/17/2013

Archive powered by MHonArc 2.6.16.

Top of Page