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

[veithen]

Author: veithen
Date: Mon Aug 16 09:59:09 2010
New Revision: 985851

URL: http://svn.apache.org/viewvc?rev=985851&view=rev
Log:
Added another missing log4j dependency.

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

Modified: axis/axis2/java/core/trunk/modules/integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/pom.xml?rev=985851&r1=985850&r2=985851&view=diff
==
--- axis/axis2/java/core/trunk/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/integration/pom.xml Mon Aug 16 09:59:09 
2010
@@ -141,6 +141,11 @@
 xmlunit
 test
 
+
+log4j
+log4j
+test
+
 
 
 

svn commit: r985923 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/integration/ modules/jaxws-integration/ modules/jaxws/ modules/kernel/src/org/apache/axis2/transport/

[veithen]

Author: veithen
Date: Mon Aug 16 13:33:02 2010
New Revision: 985923

URL: http://svn.apache.org/viewvc?rev=985923&view=rev
Log:
Added missing log4j dependencies to avoid build failure. Merge of 
r985791,985796,985851.

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/integration/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/jaxws-integration/pom.xml
axis/axis2/java/core/branches/java/1_5/modules/jaxws/pom.xml

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/parent/   (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 Mon Aug 16 13:33:02 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
+/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
 
/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 Mon Aug 16 13:33:02 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,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
+/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,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
 
/webservices/axis2/trunk/java/modules/distribution: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

Modified: axis/axis2/java/co

svn commit: r986198 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment: ServiceDeployer.java util/Utils.java

[isurues]

Author: isurues
Date: Tue Aug 17 06:10:09 2010
New Revision: 986198

URL: http://svn.apache.org/viewvc?rev=986198&view=rev
Log:
fixing an issue related to hierarchical services on Windows

Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java

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

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java?rev=986198&r1=986197&r2=986198&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ServiceDeployer.java
 Tue Aug 17 06:10:09 2010
@@ -179,7 +179,11 @@ public class ServiceDeployer extends Abs
 String serviceHierarchy = Utils.getServiceHierarchy(fileName, 
this.directory);
 fileName = Utils.getShortFileName(fileName);
 fileName = DeploymentEngine.getAxisServiceName(fileName);
-fileName = serviceHierarchy + fileName;
+
+//attach the hierarchical part if it is not null
+if (serviceHierarchy != null) {
+fileName = serviceHierarchy + fileName;
+}
 AxisServiceGroup serviceGroup = 
axisConfig.removeServiceGroup(fileName);
 if (serviceGroup != null) {
 configCtx.removeServiceGroupContext(serviceGroup);

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?rev=986198&r1=986197&r2=986198&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
 Tue Aug 17 06:10:09 2010
@@ -1885,6 +1885,7 @@ public class Utils {
 if (filePath == null || serviceDir == null) {
 return "";
 }
+filePath = formatPath(filePath);
 String[] splited = filePath.split("/" + serviceDir + "/");
 String serviceHierarchy = null;
 if (splited.length > 1) {
@@ -1903,6 +1904,19 @@ public class Utils {
 }
 
 /**
+ * Format the string paths to match any platform.. windows, linux etc..
+ *
+ * @param path - input file path
+ * @return formatted file path
+ */
+public static String formatPath(String path) {
+// removing white spaces
+path = path.replaceAll("\\b\\s+\\b", "%20");
+// replacing all "\" with "/"
+return path.replace('\\', '/');
+}
+
+/**
  * Get the class name from a resource name referring to a class file.
  * 
  * @param resourceName the resource name