perfsonar development work

Author: psnc.pietrzak
Date: 2010-05-25 10:48:16 +0100 (Tue, 25 May 2010)
New Revision: 5675

Modified:
   trunk/servlet-context-redirector/pom.xml
   trunk/servlet-context-redirector/src/main/webapp/WEB-INF/web.xml
Log:
Parameterized the context. Now, a context is a configurable property.
In order to build a redirector for the given service one must set "context" 
property value to the context to which the redirector should redirect to 
(e.g. maven package -Dcontext=perfsonar-java-sshtelnet-mp)

Modified: trunk/servlet-context-redirector/pom.xml
===================================================================
--- trunk/servlet-context-redirector/pom.xml    2010-05-24 13:37:09 UTC (rev 
5674)
+++ trunk/servlet-context-redirector/pom.xml    2010-05-25 09:48:16 UTC (rev 
5675)
@@ -22,16 +22,36 @@
                </dependency>
        </dependencies>
        <build>
-               <finalName>servlet-context-redirector</finalName>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <configuration>
-                                       <source>1.6</source>
-                                       <target>1.6</target>
-                               </configuration>
-                       </plugin>
-                       <plugin>
+         <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>
@@ -60,7 +80,29 @@
                                                </goals>
                                        </execution>
                                </executions>
-                       </plugin>
+                       </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> -->
+       
 </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-24 13:37:09 UTC (rev 5674)
+++ trunk/servlet-context-redirector/src/main/webapp/WEB-INF/web.xml    
2010-05-25 09:48:16 UTC (rev 5675)
@@ -10,7 +10,7 @@
        
<filter-class>net.geant.perfsonar.filters.RedirectionFilter</filter-class>
        <init-param>
                <param-name>redirectUrl</param-name>
-               <param-value>perfsonar-java-xml-ls</param-value>
+               <param-value>${context}</param-value>
        </init-param>
   </filter>