perfsonar development work

Author: psnc.pietrzak
Date: 2010-06-10 11:50:40 +0100 (Thu, 10 Jun 2010)
New Revision: 5693

Modified:
   trunk/servlet-context-redirector/pom.xml
   trunk/servlet-context-redirector/src/main/webapp/WEB-INF/web.xml
Log:
Corrected the pom.xml file with oldContext and newContext parameters. The way 
the pom.xml should be used is described in description section.

Modified: trunk/servlet-context-redirector/pom.xml
===================================================================
--- trunk/servlet-context-redirector/pom.xml    2010-06-09 14:47:31 UTC (rev 
5692)
+++ trunk/servlet-context-redirector/pom.xml    2010-06-10 10:50:40 UTC (rev 
5693)
@@ -6,7 +6,28 @@
        <packaging>war</packaging>
        <version>1.0</version>
        <name>servlet-context-redirector Maven Webapp</name>
+       <description>
+           <![CDATA[
+           <p>Web application that redirects temporarily to the url with the 
rewritten context part.
+           The rest of the url stays intact.</p>
+           <p>
+             There are two properties that need to be set when executing 
maven to build the project:
+             <ul>
+               <li>oldContext - name of the old context (name of the war 
file)</li>
+               <li>newContext - name of the new context to which the request 
will be redirected to</li>
+             </ul>
+           </p>            
+           <p>
+             The exemplary usage is provided below:<br/>
+             <code>mvn clean package -DoldContext=ps-mdm-sshtelnet-mp 
-DnewContext=perfsonar-java-sshtelnet-mp</code>
+           </p> 
+           ]]>
+       </description>
        <url>http://maven.apache.org</url>
+       <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+       
        <dependencies>
                <dependency>
                        <groupId>junit</groupId>
@@ -22,7 +43,7 @@
                </dependency>
        </dependencies>
        <build>
-               <finalName>${oldServiceName}</finalName>
+               <finalName>${oldContext}</finalName>
                <plugins>
                        <plugin>
                                <artifactId>maven-compiler-plugin</artifactId>
@@ -44,33 +65,9 @@
                                         </includes>
                                         <filtering>true</filtering>
                                     </resource>
-                    </webResources> 
+                    </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>
+           </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-06-09 14:47:31 UTC (rev 5692)
+++ trunk/servlet-context-redirector/src/main/webapp/WEB-INF/web.xml    
2010-06-10 10:50:40 UTC (rev 5693)
@@ -10,7 +10,7 @@
        
<filter-class>net.geant.perfsonar.filters.RedirectionFilter</filter-class>
        <init-param>
                <param-name>redirectUrl</param-name>
-               <param-value>${newServiceName}</param-value>
+               <param-value>${newContext}</param-value>
        </init-param>
   </filter>