svn commit: r935878 - in /axis/axis2/java/core/trunk/modules: kernel/src/org/apache/axis2/util/ webapp/src/main/webapp/axis2-web/

2010-04-20 Thread gdaniels 
Author: gdaniels
Date: Tue Apr 20 11:38:02 2010
New Revision: 935878

URL: http://svn.apache.org/viewvc?rev=935878&view=rev
Log:
Protect against potential XSS by sanitizing outputted user data.

Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java

axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/EngageToServiceGroup.jsp

axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/engagingglobally.jsp

axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/engagingtoanoperation.jsp

axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/engagingtoaservice.jsp

axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/listGroupService.jsp

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java?rev=935878&r1=935877&r2=935878&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java 
(original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java 
Tue Apr 20 11:38:02 2010
@@ -373,6 +373,17 @@ public class Utils {
 return moduleName;
 }
 
+private static final String ILLEGAL_CHARACTERS = "/\n\r\t\0\f`?*\\<>|\":";
+public static boolean isValidModuleName(String moduleName) {
+for (int i = 0; i < moduleName.length(); i++) {
+char c = moduleName.charAt(i);
+if ((c > 127) || (ILLEGAL_CHARACTERS.indexOf(c) >= 0)) {
+return false;
+}
+}
+return true;
+}
+
 /**
  * - if he trying to engage the same module then method will returen false
  * - else it will return true
@@ -653,6 +664,11 @@ public class Utils {
 int index = uri.indexOf(':');
 return index > 0 ? uri.substring(0, index) : null;
 }
+
+public static String sanitizeWebOutput(String text) {
+text = text.replaceAll("<", "<");
+return text;
+}
 
 /**
  * Create a service object for a given service. The method first looks for

Modified: 
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/EngageToServiceGroup.jsp
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/EngageToServiceGroup.jsp?rev=935878&r1=935877&r2=935878&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/EngageToServiceGroup.jsp
 (original)
+++ 
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/EngageToServiceGroup.jsp
 Tue Apr 20 11:38:02 2010
@@ -23,6 +23,7 @@
  
java.util.Collection" %>
 <%@ page import="java.util.HashMap"%>
 <%@ page import="java.util.Iterator"%>
+<%@ page import="org.apache.axis2.util.Utils" %>
 
 <%
 String status = 
(String)request.getSession().getAttribute(Constants.ENGAGE_STATUS);
@@ -124,7 +125,7 @@
   style="display:none"
 <%
 } %>
-><%=status%>
+><%=Utils.sanitizeWebOutput(status)%>
 
 
 

Modified: 
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/engagingglobally.jsp
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/engagingglobally.jsp?rev=935878&r1=935877&r2=935878&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/engagingglobally.jsp
 (original)
+++ 
axis/axis2/java/core/trunk/modules/webapp/src/main/webapp/axis2-web/engagingglobally.jsp
 Tue Apr 20 11:38:02 2010
@@ -22,6 +22,7 @@
  java.util.Collection,
  java.util.HashMap,
  java.util.Iterator" %>
+<%@ page import="org.apache.axis2.util.Utils" %>
 
 
 <%
@@ -40,13 +41,15 @@
 
 
 <%
-HashMap moduels = (HashMap) 
request.getSession().getAttribute(Constants.MODULE_MAP);
+HashMap modules = (HashMap) 
request.getSession().getAttribute(Constants.MODULE_MAP);
 
request.getSession().setAttribute(Constants.MODULE_MAP,null);
-Collection moduleCol = moduels.values();
+Collection moduleCol = modules.values(

svn commit: r949879 - /axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml

2010-05-31 Thread gdaniels 
Author: gdaniels
Date: Mon May 31 22:31:09 2010
New Revision: 949879

URL: http://svn.apache.org/viewvc?rev=949879&view=rev
Log:
Earlier change in R944301 apparently broke the Windows build?  This fixes it 
for me, feel free to edit if necessary.

Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml

Modified: axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml?rev=949879&r1=949878&r2=949879&view=diff
==
--- axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml Mon May 31 
22:31:09 2010
@@ -458,7 +458,7 @@
 
 
 
-
+

svn commit: r953380 - in /axis/axis2/java/core/branches/java/1_5/modules: kernel/src/org/apache/axis2/util/ webapp/src/main/webapp/axis2-web/

2010-06-10 Thread gdaniels 
Author: gdaniels
Date: Thu Jun 10 16:30:29 2010
New Revision: 953380

URL: http://svn.apache.org/viewvc?rev=953380&view=rev
Log:
Merge XSS fix (r935878) over for 1.5.2 release.

Modified:

axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/util/Utils.java

axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/webapp/axis2-web/EngageToServiceGroup.jsp

axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/webapp/axis2-web/engagingglobally.jsp

axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/webapp/axis2-web/engagingtoanoperation.jsp

axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/webapp/axis2-web/engagingtoaservice.jsp

axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/webapp/axis2-web/listGroupService.jsp

Modified: 
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/util/Utils.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/util/Utils.java?rev=953380&r1=953379&r2=953380&view=diff
==
--- 
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/util/Utils.java
 (original)
+++ 
axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/util/Utils.java
 Thu Jun 10 16:30:29 2010
@@ -296,6 +296,17 @@ public class Utils {
 return moduleName;
 }
 
+private static final String ILLEGAL_CHARACTERS = "/\n\r\t\0\f`?*\\<>|\":";
+public static boolean isValidModuleName(String moduleName) {
+for (int i = 0; i < moduleName.length(); i++) {
+char c = moduleName.charAt(i);
+if ((c > 127) || (ILLEGAL_CHARACTERS.indexOf(c) >= 0)) {
+return false;
+}
+}
+return true;
+}
+
 /**
  * - if he trying to engage the same module then method will returen false
  * - else it will return true
@@ -553,4 +564,9 @@ public class Utils {
 private static boolean isIP(String hostAddress) {
 return hostAddress.split("[.]").length == 4;
 }
+
+public static String sanitizeWebOutput(String text) {
+text = text.replaceAll("<", "<");
+return text;
+}
 }

Modified: 
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/webapp/axis2-web/EngageToServiceGroup.jsp
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/webapp/axis2-web/EngageToServiceGroup.jsp?rev=953380&r1=953379&r2=953380&view=diff
==
--- 
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/webapp/axis2-web/EngageToServiceGroup.jsp
 (original)
+++ 
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/webapp/axis2-web/EngageToServiceGroup.jsp
 Thu Jun 10 16:30:29 2010
@@ -23,6 +23,7 @@
  
java.util.Collection" %>
 <%@ page import="java.util.HashMap"%>
 <%@ page import="java.util.Iterator"%>
+<%@ page import="org.apache.axis2.util.Utils" %>
 
 <%
 String status = 
(String)request.getSession().getAttribute(Constants.ENGAGE_STATUS);
@@ -124,7 +125,7 @@
   style="display:none"
 <%
 } %>
-><%=status%>
+><%=Utils.sanitizeWebOutput(status)%>
 
 
 

Modified: 
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/webapp/axis2-web/engagingglobally.jsp
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/webapp/axis2-web/engagingglobally.jsp?rev=953380&r1=953379&r2=953380&view=diff
==
--- 
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/webapp/axis2-web/engagingglobally.jsp
 (original)
+++ 
axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/webapp/axis2-web/engagingglobally.jsp
 Thu Jun 10 16:30:29 2010
@@ -22,6 +22,7 @@
  java.util.Collection,
  java.util.HashMap,
  java.util.Iterator" %>
+<%@ page import="org.apache.axis2.util.Utils" %>
 
 
 <%
@@ -40,13 +41,15 @@
 
 
 <%
-HashMap moduels = (HashMap) 
request.getSession().getAttribute(Constants.MODULE_MAP);
+HashMap modules = (HashMap) 
request.getSession().getAttribute(Constants.MODULE_MAP);
 
request.getSession().setAttribute(Constants.MODULE_MAP

svn commit: r987196 [7/7] - in /axis/axis2/java/core/branches/java/1_5: etc/ etc/IDEA/ legal/ modules/ modules/adb-codegen/ modules/adb-codegen/src/ modules/adb-codegen/src/org/ modules/adb-codegen/sr

2010-08-19 Thread gdaniels 
Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-wsdl2code-maven-plugin/src/test/java/org/apache/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 15:44:05 2010
@@ -0,0 +1,4 @@
+*.ipr
+*.iml
+*.iws
+target

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-wsdl2code-maven-plugin/src/test/java/org/apache/axis2/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 15:44:05 2010
@@ -0,0 +1,4 @@
+*.ipr
+*.iml
+*.iws
+target

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-wsdl2code-maven-plugin/src/test/java/org/apache/axis2/maven2/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 15:44:05 2010
@@ -0,0 +1,4 @@
+*.ipr
+*.iml
+*.iws
+target

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-wsdl2code-maven-plugin/src/test/java/org/apache/axis2/maven2/wsdl2code/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 15:44:05 2010
@@ -0,0 +1,4 @@
+*.ipr
+*.iml
+*.iws
+target

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-wsdl2code-maven-plugin/src/test/resources/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 15:44:05 2010
@@ -0,0 +1,4 @@
+*.ipr
+*.iml
+*.iws
+target

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-wsdl2code-maven-plugin/src/test/test1/
--
--- svn:ignore (original)
+++ svn:ignore Thu Aug 19 15:44:05 2010
@@ -1 +1,4 @@
+*.ipr
+*.iml
+*.iws
 target

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-wsdl2code-maven-plugin/src/test/test1/src/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 15:44:05 2010
@@ -0,0 +1,4 @@
+*.ipr
+*.iml
+*.iws
+target

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-wsdl2code-maven-plugin/src/test/test1/src/main/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 15:44:05 2010
@@ -0,0 +1,4 @@
+*.ipr
+*.iml
+*.iws
+target

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-wsdl2code-maven-plugin/src/test/test1/src/main/axis2/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 15:44:05 2010
@@ -0,0 +1,4 @@
+*.ipr
+*.iml
+*.iws
+target

Propchange: axis/axis2/java/core/branches/java/1_5/modules/tool/script/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 15:44:05 2010
@@ -0,0 +1,4 @@
+*.ipr
+*.iml
+*.iws
+target

Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 15:44:05 2010
@@ -0,0 +1,4 @@
+*.ipr
+*.iml
+*.iws
+target

Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/http/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 15:44:05 2010
@@ -0,0 +1,4 @@
+*.ipr
+*.iml
+*.iws
+target

Propchange: axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 15:44:05 2010
@@ -0,0 +1,4 @@
+*.ipr
+*.iml
+*.iws
+target

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/org/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 15:44:05 2010
@@ -0,0 +1,4 @@
+*.ipr
+*.iml
+*.iws
+target

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/org/apache/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 15:44:05 2010
@@ -0,0 +1,4 @@
+*.ipr
+*.iml
+*.iws
+target

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/org/apache/axis2/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 15:44:05 2010
@@ -0,0 +1,4 @@
+*.ipr
+*.iml
+*.iws
+target

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/org/apache/axis2/transport/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 15:44:05 2010
@@ -0,0 +1,4 @@
+*.ipr
+*.iml
+*.iws
+target

Propchange: 
axis/axis2

svn commit: r987207 - /axis/axis2/java/core/branches/java/1_5/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetInputOutputTest.java

2010-08-19 Thread gdaniels 
Author: gdaniels
Date: Thu Aug 19 16:02:42 2010
New Revision: 987207

URL: http://svn.apache.org/viewvc?rev=987207&view=rev
Log:
Put output files in target directory so they get cleaned up and don't interfere 
with release work.

Modified:

axis/axis2/java/core/branches/java/1_5/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetInputOutputTest.java

Modified: 
axis/axis2/java/core/branches/java/1_5/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetInputOutputTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetInputOutputTest.java?rev=987207&r1=987206&r2=987207&view=diff
==
--- 
axis/axis2/java/core/branches/java/1_5/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetInputOutputTest.java
 (original)
+++ 
axis/axis2/java/core/branches/java/1_5/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetInputOutputTest.java
 Thu Aug 19 16:02:42 2010
@@ -48,8 +48,8 @@ public class FastInfosetInputOutputTest 
  */
 public void testInputOutput() throws Exception {
 String inputFile = "pom.xml";
-File outputFile = new File("output.xml");
-File tempFile = new File("test.bin");
+File outputFile = new File("target/output.xml");
+File tempFile = new File("target/test.bin");
 
 try {
 // first let's read the xml document in to Axiom

svn commit: r987225 - /axis/axis2/java/core/trunk/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetInputOutputTest.java

2010-08-19 Thread gdaniels 
Author: gdaniels
Date: Thu Aug 19 16:33:46 2010
New Revision: 987225

URL: http://svn.apache.org/viewvc?rev=987225&view=rev
Log:
Merge r987207 over from 1.5 branch.

Modified:

axis/axis2/java/core/trunk/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetInputOutputTest.java

Modified: 
axis/axis2/java/core/trunk/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetInputOutputTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetInputOutputTest.java?rev=987225&r1=987224&r2=987225&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetInputOutputTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/fastinfoset/test/org/apache/axis2/fastinfoset/FastInfosetInputOutputTest.java
 Thu Aug 19 16:33:46 2010
@@ -48,8 +48,8 @@ public class FastInfosetInputOutputTest 
  */
 public void testInputOutput() throws Exception {
 String inputFile = "pom.xml";
-File outputFile = new File("output.xml");
-File tempFile = new File("test.bin");
+File outputFile = new File("target/output.xml");
+File tempFile = new File("target/test.bin");
 
 try {
 // first let's read the xml document in to Axiom

svn commit: r987290 [4/4] - in /axis/axis2/java/core/branches/java/1_5: etc/ etc/IDEA/ legal/ modules/ modules/adb-codegen/ modules/adb-codegen/src/ modules/adb-codegen/src/org/ modules/adb-codegen/sr

2010-08-19 Thread gdaniels 
Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/quickstartjibx/resources/META-INF/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/quickstartjibx/src/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/quickstartjibx/src/samples/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/quickstartjibx/src/samples/quickstart/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/quickstartjibx/src/samples/quickstart/clients/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/quickstartjibx/src/samples/quickstart/service/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/quickstartjibx/src/samples/quickstart/service/jibx/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/quickstartxmlbeans/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/quickstartxmlbeans/resources/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/quickstartxmlbeans/resources/META-INF/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/quickstartxmlbeans/src/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/quickstartxmlbeans/src/samples/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/quickstartxmlbeans/src/samples/quickstart/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/quickstartxmlbeans/src/samples/quickstart/clients/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/quickstartxmlbeans/src/samples/quickstart/service/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/quickstartxmlbeans/src/samples/quickstart/service/xmlbeans/
('svn:ignore' removed)

Propchange: axis/axis2/java/core/branches/java/1_5/modules/samples/resources/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/resources/eventing/
('svn:ignore' removed)

Propchange: axis/axis2/java/core/branches/java/1_5/modules/samples/resources/om/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/resources/om/binary/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/resources/security/
('svn:ignore' removed)

Propchange: axis/axis2/java/core/branches/java/1_5/modules/samples/rmi/
('svn:ignore' removed)

Propchange: axis/axis2/java/core/branches/java/1_5/modules/samples/rmi/conf/
('svn:ignore' removed)

Propchange: axis/axis2/java/core/branches/java/1_5/modules/samples/rmi/src/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/rmi/src/sample/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/rmi/src/sample/rmi/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/rmi/src/sample/rmi/client/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/rmi/src/sample/rmi/server/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/rmi/src/sample/rmi/server/databind/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/rmi/src/sample/rmi/server/dto/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/rmi/src/sample/rmi/server/exception/
('svn:ignore' removed)

Propchange: axis/axis2/java/core/branches/java/1_5/modules/samples/script/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/script/userguide/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/script/userguide/client_scripts/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/servicelifecycle/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/servicelifecycle/doc/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/servicelifecycle/src/
('svn:ignore' removed)

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/samples/servicelifecycle/src/META-INF/
('s

svn commit: r987313 - in /axis/axis2/java/core/trunk/modules: jaxws-mar/ mtompolicy-mar/ resource-bundle/ samples/ samples/book/ samples/java_first_jaxws/ samples/jaxws-addressbook/ samples/jaxws-calc

2010-08-19 Thread gdaniels 
Author: gdaniels
Date: Thu Aug 19 21:07:51 2010
New Revision: 987313

URL: http://svn.apache.org/viewvc?rev=987313&view=rev
Log:
Add some ignore config for IDEA users.

Modified:
axis/axis2/java/core/trunk/modules/jaxws-mar/   (props changed)
axis/axis2/java/core/trunk/modules/mtompolicy-mar/   (props changed)
axis/axis2/java/core/trunk/modules/resource-bundle/   (props changed)
axis/axis2/java/core/trunk/modules/samples/   (props changed)
axis/axis2/java/core/trunk/modules/samples/book/   (props changed)
axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/   (props 
changed)
axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/   (props 
changed)
axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/   (props 
changed)
axis/axis2/java/core/trunk/modules/samples/jaxws-interop/   (props changed)
axis/axis2/java/core/trunk/modules/samples/jaxws-samples/   (props changed)
axis/axis2/java/core/trunk/modules/samples/jaxws-version/   (props changed)
axis/axis2/java/core/trunk/modules/samples/version/   (props changed)
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/   
(props changed)
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/   
(props changed)
axis/axis2/java/core/trunk/modules/tool/axis2-repo-maven-plugin/   (props 
changed)
axis/axis2/java/core/trunk/modules/transport/http/   (props changed)
axis/axis2/java/core/trunk/modules/transport/local/   (props changed)

Propchange: axis/axis2/java/core/trunk/modules/jaxws-mar/
--
--- svn:ignore (original)
+++ svn:ignore Thu Aug 19 21:07:51 2010
@@ -2,3 +2,4 @@
 target
 .classpath
 .project
+*.iml

Propchange: axis/axis2/java/core/trunk/modules/mtompolicy-mar/
--
--- svn:ignore (original)
+++ svn:ignore Thu Aug 19 21:07:51 2010
@@ -2,3 +2,4 @@
 target
 .classpath
 .project
+*.iml

Propchange: axis/axis2/java/core/trunk/modules/resource-bundle/
--
--- svn:ignore (original)
+++ svn:ignore Thu Aug 19 21:07:51 2010
@@ -2,3 +2,4 @@
 target
 .classpath
 .project
+*.iml

Propchange: axis/axis2/java/core/trunk/modules/samples/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 21:07:51 2010
@@ -0,0 +1 @@
+*.iml

Propchange: axis/axis2/java/core/trunk/modules/samples/book/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 21:07:51 2010
@@ -0,0 +1 @@
+*.iml

Propchange: axis/axis2/java/core/trunk/modules/samples/java_first_jaxws/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 21:07:51 2010
@@ -0,0 +1 @@
+*.iml

Propchange: axis/axis2/java/core/trunk/modules/samples/jaxws-addressbook/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 21:07:51 2010
@@ -0,0 +1 @@
+*.iml

Propchange: axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 21:07:51 2010
@@ -0,0 +1 @@
+*.iml

Propchange: axis/axis2/java/core/trunk/modules/samples/jaxws-interop/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 21:07:51 2010
@@ -0,0 +1 @@
+*.iml

Propchange: axis/axis2/java/core/trunk/modules/samples/jaxws-samples/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 21:07:51 2010
@@ -0,0 +1 @@
+*.iml

Propchange: axis/axis2/java/core/trunk/modules/samples/jaxws-version/
--
--- svn:ignore (added)
+++ svn:ignore Thu Aug 19 21:07:51 2010
@@ -0,0 +1 @@
+*.iml

Propchange: axis/axis2/java/core/trunk/modules/samples/version/
--
--- svn:ignore (original)
+++ svn:ignore Thu Aug 19 21:07:51 2010
@@ -1,4 +1,4 @@
-version.iml
+*.iml
 target
 .settings
 .classpath

Propchange: 
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/
--
--- svn:ignore (original)
+++ svn:ignore Thu Aug 19 21:07:51 2010
@@ -1,4 +1,4 @@
-axis2.eclipse.codegen.plugin.iml
+*.iml
 target
 META-INF
 lib

Propchange: 
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/
--
--- svn:ignore (original)
+++ svn:ignore Thu Aug 19 21:07:51 2010
@@ -1,4 +1,4 @@
-a

svn commit: r987320 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/jaxws-mar/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/ax

2010-08-19 Thread gdaniels 
Author: gdaniels
Date: Thu Aug 19 21:38:10 2010
New Revision: 987320

URL: http://svn.apache.org/viewvc?rev=987320&view=rev
Log:
Merge over r987313 from trunk.  There were a few merge conflicts(?) which I 
manually fixed, and I'm allowing all the mergeinfo updates, even the ones that 
look odd to me.  As such, let me know if anything seems weird with this commit.

Modified:
axis/axis2/java/core/branches/java/1_5/   (props changed)
axis/axis2/java/core/branches/java/1_5/modules/distribution/   (props 
changed)
axis/axis2/java/core/branches/java/1_5/modules/jaxws-mar/   (props changed)

axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java
   (props changed)

axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java
   (props changed)
axis/axis2/java/core/branches/java/1_5/modules/mtompolicy-mar/   (props 
changed)
axis/axis2/java/core/branches/java/1_5/modules/parent/   (props changed)
axis/axis2/java/core/branches/java/1_5/modules/resource-bundle/   (props 
changed)
axis/axis2/java/core/branches/java/1_5/modules/samples/   (props changed)
axis/axis2/java/core/branches/java/1_5/modules/samples/book/   (props 
changed)
axis/axis2/java/core/branches/java/1_5/modules/samples/java_first_jaxws/   
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/samples/jaxws-addressbook/   
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/samples/jaxws-calculator/   
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/samples/jaxws-interop/   
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/samples/jaxws-samples/   
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/samples/jaxws-version/   
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/samples/version/   (props 
changed)

axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-codegen-plugin/
   (props changed)

axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-service-plugin/
   (props changed)

axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-repo-maven-plugin/   
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/http/   (props 
changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml   
(props changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/   (props 
changed)
axis/axis2/java/core/branches/java/1_5/modules/transport/local/   (props 
changed)

axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
   (props changed)

axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
   (props changed)

Propchange: axis/axis2/java/core/branches/java/1_5/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 19 21:38:10 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889
+/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313
 
/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777882,777897,777934,783479,801630,803725,805981,805999,807160,807487,816740,816891,834058,834175,904780,905980

Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 19 21:38:10 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/dis