perfsonar development work

Author: michael.bischoff
Date: 2008-05-26 13:12:56 -0400 (Mon, 26 May 2008)
New Revision: 3877

Modified:
   trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml
   trunk/surfnet_java-flowsa-ma/pom.xml
Log:
q4eclipse workaround
update web.xml issue

Modified: trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml
===================================================================
--- trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml  2008-05-26 
16:49:57 UTC (rev 3876)
+++ trunk/surfnet_java-flowsa-ma/conf/axis-1.4/WEB-INF/web.xml  2008-05-26 
17:12:56 UTC (rev 3877)
@@ -12,11 +12,7 @@
                <init-param>
                        <param-name>ips</param-name>
                        <param-value>
-<<<<<<< .mine
-                               127.0.0.1 62.131.17.150 78.27.8.39 
192.87.102.* 192.87.109.* 192.87.117.*
-=======
                                127.0.0.1 62.131.17.150 78.27.8.39 
192.87.102.* 192.87.109.* 192.87.117.*
->>>>>>> .r3835
                        </param-value>
                        <description>
                                A space separated list of ips that are 
allowed to access

Modified: trunk/surfnet_java-flowsa-ma/pom.xml
===================================================================
--- trunk/surfnet_java-flowsa-ma/pom.xml        2008-05-26 16:49:57 UTC (rev 
3876)
+++ trunk/surfnet_java-flowsa-ma/pom.xml        2008-05-26 17:12:56 UTC (rev 
3877)
@@ -111,6 +111,16 @@
         </configuration>
       </plugin>
     </plugins>
+    <!-- Workaround for q4eclipse -->
+    <pluginManagement>
+     <plugins>
+      <plugin>
+       <artifactId>maven-surefire-plugin</artifactId>
+       <version>2.4.2</version>
+      </plugin>
+     </plugins>
+    </pluginManagement>
+    <!-- Workaround for q4eclipse -->
   </build>
   <repositories>
     <repository>