perfsonar development work

Author: dante.delvaux
Date: 2013-05-17 20:50:21 +0100 (Fri, 17 May 2013)
New Revision: 6395

Modified:
   trunk/parent/pom.xml
   trunk/perfsonar-java-base2/
   trunk/perfsonar-java-base2/pom.xml
   
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/pom.xml
   
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/java/org/perfsonar/webadmin/example/servlet/ExampleServlet.java
   trunk/perfsonar-java-web-admin/pom.xml
Log:
Parent 1.0.3: removing tomcat6 plugin link to integration-test phase as it 
prevents releasing other modules.
WebAdmin: preparing for release.

Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml        2013-05-17 17:39:20 UTC (rev 6394)
+++ trunk/parent/pom.xml        2013-05-17 19:50:21 UTC (rev 6395)
@@ -7,7 +7,7 @@
     
     <groupId>net.geant.perfsonar</groupId>
     <artifactId>parent</artifactId>
-    <version>1.0.4-SNAPSHOT</version>
+    <version>1.0.3</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -361,18 +361,9 @@
                     <groupId>org.apache.tomcat.maven</groupId>
                     <artifactId>tomcat6-maven-plugin</artifactId>
                     <version>2.1</version>
-                    <executions>
-                       <execution>
-                           <id>run-war</id>
-                           <!-- We link this plugin to some non default 
phase so that we can disable it in some modules. -->
-                           <!-- You might need to increase Maven allocated 
memory for this plugin to work properly. -->
-                           <!-- MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=512m" 
-->
-                           <phase>integration-test</phase>
-                           <goals>
-                               <goal>run-war</goal>
-                           </goals>
-                       </execution>
-                    </executions>
+                    <!-- Call it in a submodule with mvn tomcat6:run-war -->
+                    <!-- You might need to increase Maven allocated memory 
for this plugin to work properly. -->
+                    <!-- MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=512m" -->
                 </plugin>
           
                 <!-- QA and reporting plugins -->


Property changes on: trunk/perfsonar-java-base2
___________________________________________________________________
Added: svn:externals
   + 
svn+ssh:///GEANT/SA2/ps-java-services/trunk/parent/common
 common


Modified: trunk/perfsonar-java-base2/pom.xml
===================================================================
--- trunk/perfsonar-java-base2/pom.xml  2013-05-17 17:39:20 UTC (rev 6394)
+++ trunk/perfsonar-java-base2/pom.xml  2013-05-17 19:50:21 UTC (rev 6395)
@@ -5,6 +5,7 @@
         <groupId>net.geant.perfsonar</groupId>
         <artifactId>parent</artifactId>
         <version>1.0.2</version>
+        <!-- We keep parent 1.0.2 because pSbase2 doesn't pass all the new 
PMD and Checkstyle tests. -->
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
 

Modified: 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/pom.xml
===================================================================
--- 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/pom.xml
      2013-05-17 17:39:20 UTC (rev 6394)
+++ 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/pom.xml
      2013-05-17 19:50:21 UTC (rev 6395)
@@ -68,11 +68,6 @@
                                        </overlays>
                                </configuration>
                        </plugin>
-                       <plugin>
-                               <groupId>org.apache.tomcat.maven</groupId>
-                               <artifactId>tomcat6-maven-plugin</artifactId>
-                               <!-- This plugin can be called with a simple 
'mvn clean tomcat6:run-war' -->
-                       </plugin>
                </plugins>
 
        </build>

Modified: 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/java/org/perfsonar/webadmin/example/servlet/ExampleServlet.java
===================================================================
--- 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/java/org/perfsonar/webadmin/example/servlet/ExampleServlet.java
     2013-05-17 17:39:20 UTC (rev 6394)
+++ 
trunk/perfsonar-java-web-admin/perfsonar-java-web-admin-exampleservice/src/main/java/org/perfsonar/webadmin/example/servlet/ExampleServlet.java
     2013-05-17 19:50:21 UTC (rev 6395)
@@ -13,25 +13,24 @@
 
 /**
  * @author Antoine Delvaux - DANTE
- *
+ * 
  */
 @SuppressWarnings("serial")
 public class ExampleServlet extends BasicServlet {
 
-       /**
-        * You override the doGet or doPost method to define your Servlet 
behavior
-        */
-       @Override
-       protected void doGet(HttpServletRequest req, HttpServletResponse 
resp) throws ServletException, IOException {
+    /**
+     * You override the doGet or doPost method to define your Servlet 
behavior
+     */
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp) 
throws ServletException, IOException {
 
-               req.setAttribute("exampleAttribute", "Hello from the 
servlet!");
-               
-               // If you want to have the same look and feel as the rest of 
the WebAdmin
-               // You can just forward the request to the index.jsp page and 
give
-               // your new views/example.jsp age as parameter.
-               getServletConfig().getServletContext().getRequestDispatcher(
-                               "/index.jsp?page=example").forward(req, resp);
+        req.setAttribute("exampleAttribute", "Hello from the servlet!");
 
-       }
+        // If you want to have the same look and feel as the rest of the 
WebAdmin
+        // You can just forward the request to the index.jsp page and give
+        // your new views/example.jsp age as parameter.
+        
getServletConfig().getServletContext().getRequestDispatcher("/index.jsp?page=example").forward(req,
 resp);
 
+    }
+
 }

Modified: trunk/perfsonar-java-web-admin/pom.xml
===================================================================
--- trunk/perfsonar-java-web-admin/pom.xml      2013-05-17 17:39:20 UTC (rev 
6394)
+++ trunk/perfsonar-java-web-admin/pom.xml      2013-05-17 19:50:21 UTC (rev 
6395)
@@ -34,4 +34,16 @@
         
<url>https://svn.geant.net/fisheye/browse/SA2T3-ps-java-services/trunk/perfsonar-java-web-admin/</url>
     </scm>
 
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>2.4.1</version>
+                <configuration>
+                    <autoVersionSubmodules>true</autoVersionSubmodules>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>