perfsonar development work

Author: psnc.trzaszczka
Date: 2010-05-25 12:27:25 +0100 (Tue, 25 May 2010)
New Revision: 5676

Modified:
   trunk/servlet-context-redirector/pom.xml
   trunk/servlet-context-redirector/src/main/webapp/WEB-INF/web.xml
Log:
added opportunity to build package with particular parameters like 
oldServiceName - old war package name and newServiceName - context to the new 
service

Modified: trunk/servlet-context-redirector/pom.xml
===================================================================
--- trunk/servlet-context-redirector/pom.xml    2010-05-25 09:48:16 UTC (rev 
5675)
+++ trunk/servlet-context-redirector/pom.xml    2010-05-25 11:27:25 UTC (rev 
5676)
@@ -22,87 +22,55 @@
                </dependency>
        </dependencies>
        <build>
-         <finalName>servlet-context-redirector</finalName>
-       
-         <resources>
-        <resource>
-          <directory>src/main/webapp/WEB-INF</directory>
-          <filtering>true</filtering>
-          <includes>
-            <include>**/*.xml</include>
-          </includes>
-        </resource>
-      </resources>
-               
-       <plugins>
-         <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.4.2</version>
-        <configuration>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
-        
-         <plugin>
-               <artifactId>maven-compiler-plugin</artifactId>
-               <configuration>
-                 <source>1.6</source>
-                 <target>1.6</target>
-               </configuration>
-         </plugin>
-                       <!-- <plugin>
-                               <groupId>org.mortbay.jetty</groupId>
-                               <artifactId>maven-jetty-plugin</artifactId>
-                               <version>6.1.10</version>
+               <finalName>${oldServiceName}</finalName>
+               <plugins>
+                       <plugin>
+                               <artifactId>maven-compiler-plugin</artifactId>
                                <configuration>
-                                       
<scanIntervalSeconds>10</scanIntervalSeconds>
-                                       <stopKey>foo</stopKey>
-                                       <stopPort>9999</stopPort>
+                                       <source>1.6</source>
+                                       <target>1.6</target>
                                </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>start-jetty</id>
-                                               
<phase>pre-integration-test</phase>
-                                               <goals>
-                                                       <goal>run</goal>
-                                               </goals>
-                                               <configuration>
-                                                       
<scanIntervalSeconds>0</scanIntervalSeconds>
-                                                       <daemon>true</daemon>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>stop-jetty</id>
-                                               
<phase>post-integration-test</phase>
-                                               <goals>
-                                                       <goal>stop</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin> -->
-               </plugins>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-war-plugin</artifactId>
+                               <configuration>
+                                       <webResources>
+                                    <resource>
+                                        
<directory>src/main/webapp/WEB-INF</directory>
+                                           <targetPath>WEB-INF</targetPath>
+                                        <includes>
+                                            <include>web.xml</include>
+                                        </includes>
+                                        <filtering>true</filtering>
+                                    </resource>
+                    </webResources> 
+                               </configuration>
+                       </plugin>
+
+               <!--
+                       <plugin> <groupId>org.mortbay.jetty</groupId>
+                       <artifactId>maven-jetty-plugin</artifactId> 
<version>6.1.10</version>
+                       <configuration> 
<scanIntervalSeconds>10</scanIntervalSeconds>
+                       <stopKey>foo</stopKey> <stopPort>9999</stopPort> 
</configuration>
+                       <executions> <execution> <id>start-jetty</id>
+                       <phase>pre-integration-test</phase> <goals> 
<goal>run</goal> </goals>
+                       <configuration> 
<scanIntervalSeconds>0</scanIntervalSeconds>
+                       <daemon>true</daemon> </configuration> </execution> 
<execution>
+                       <id>stop-jetty</id> 
<phase>post-integration-test</phase> <goals>
+                       <goal>stop</goal> </goals> </execution> </executions> 
</plugin>
+               -->
+       </plugins>
        </build>
-       
-       <!-- <profiles>
-         <profile>
-           <id>sshtelnet-mp</id>
-           <properties>
-                 <context>perfsonar-java-sshtelnet-mp</context>
-           </properties>
-         </profile>
-         <profile>
-           <id>xml-ls</id>
-           <properties>
-                 <context>perfsonar-java-xml-ls</context>
-           </properties>
-         </profile>
-         <profile>
-           <id>rrd-ma</id>
-           <properties>
-                 <context>perfsonar-java-rrd-ma</context>
-           </properties>
-         </profile>
-    </profiles> -->
-       
+
+       <!--
+               <profiles> <profile> <id>sshtelnet-mp</id> <properties>
+               <context>perfsonar-java-sshtelnet-mp</context> </properties>
+               </profile> <profile> <id>xml-ls</id> <properties>
+               <context>perfsonar-java-xml-ls</context> </properties> 
</profile>
+               <profile> <id>rrd-ma</id> <properties>
+               <context>perfsonar-java-rrd-ma</context> </properties> 
</profile>
+               </profiles>
+       -->
+
 </project>

Modified: trunk/servlet-context-redirector/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/servlet-context-redirector/src/main/webapp/WEB-INF/web.xml    
2010-05-25 09:48:16 UTC (rev 5675)
+++ trunk/servlet-context-redirector/src/main/webapp/WEB-INF/web.xml    
2010-05-25 11:27:25 UTC (rev 5676)
@@ -10,7 +10,7 @@
        
<filter-class>net.geant.perfsonar.filters.RedirectionFilter</filter-class>
        <init-param>
                <param-name>redirectUrl</param-name>
-               <param-value>${context}</param-value>
+               <param-value>${newServiceName}</param-value>
        </init-param>
   </filter>