svn commit: r981436 - /axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/c/BuildScriptTemplate.xsl
Author: nandika Date: Mon Aug 2 09:54:15 2010 New Revision: 981436 URL: http://svn.apache.org/viewvc?rev=981436&view=rev Log: Axis2c version number updated in BuildScriptTemplate.xsl Modified: axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/c/BuildScriptTemplate.xsl Modified: axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/c/BuildScriptTemplate.xsl URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/c/BuildScriptTemplate.xsl?rev=981436&r1=981435&r2=981436&view=diff == --- axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/c/BuildScriptTemplate.xsl (original) +++ axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/c/BuildScriptTemplate.xsl Mon Aug 2 09:54:15 2010 @@ -27,7 +27,7 @@ -gcc -g -shared -olib.so -I $AXIS2C_HOME/include/axis2-1.5.0/ -I -L$AXIS2C_HOME/lib \ +gcc -g -shared -olib.so -I $AXIS2C_HOME/include/axis2-1.7.0/ -I -L$AXIS2C_HOME/lib \ -laxutil \ -laxis2_axiom \ -laxis2_engine \ @@ -39,7 +39,7 @@ gcc -g -shared -olib/*.c -gcc -g -shared -olib.so -I $AXIS2C_HOME/include/axis2-1.5.0/ -L$AXIS2C_HOME/lib \ +gcc -g -shared -olib.so -I $AXIS2C_HOME/include/axis2-1.7.0/ -L$AXIS2C_HOME/lib \ -laxutil \ -laxis2_axiom \ -laxis2_engine \
svn commit: r981674 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/jaxws/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/axis2/
Author: veithen Date: Mon Aug 2 20:19:50 2010 New Revision: 981674 URL: http://svn.apache.org/viewvc?rev=981674&view=rev Log: Merged r981668 to the 1.5 branch. 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/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 2 20:19:50 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,981311 -/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,801630,803725,805999,807160,834058,834175,904780,905980 +/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,801630,803725,805999,807160,816740,834058,834175,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 2 20:19:50 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,981311 -/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,801630,803725,805999,807160,834058,834175,904780,905980 +/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,801630,803725,805999,807160,816740,834058,834175,904780,905980 Modified: axis/axis2/java/core/branches/java/1_5/modules/jaxws/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/jaxws/pom.xml?rev=981674&r1=981673&r2=981674&view=diff == --- axis/axis2/java/core/branches/java/1_5/modules/jaxws/pom.xml (original) +++ axis/axis2/java/core/branches/java/1_5/modules/jaxws/pom.xml Mon Aug 2 20:19:50 2010 @@ -55,10 +55,6 @@ xml-resolver -jaxen -jaxen - - com.sun.xml.bind jaxb-impl Propchange: axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 2 20:19:50 2010 @@ -1,2 +1,2 @@ /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java: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,981311 -/
svn commit: r981679 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/distribution/src/main/assembly/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kern
Author: veithen Date: Mon Aug 2 20:35:06 2010 New Revision: 981679 URL: http://svn.apache.org/viewvc?rev=981679&view=rev Log: Merged r807487 to the 1.5 branch. 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/distribution/src/main/assembly/bin-assembly.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 2 20:35:06 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,981311 -/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,801630,803725,805999,807160,816740,834058,834175,904780,905980 +/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,801630,803725,805999,807160,807487,816740,834058,834175,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 2 20:35:06 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,981311 -/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,801630,803725,805999,807160,816740,834058,834175,904780,905980 +/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,801630,803725,805999,807160,807487,816740,834058,834175,904780,905980 Modified: axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/bin-assembly.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/bin-assembly.xml?rev=981679&r1=981678&r2=981679&view=diff == --- axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/bin-assembly.xml (original) +++ axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/bin-assembly.xml Mon Aug 2 20:35:06 2010 @@ -224,14 +224,12 @@ xmlpull:xmlpull:jar xerces:xmlParserAPIs:jar org.apache.xbean:xbean-spring:jar - org.apache.tomcat:tribes:jar org.springframework:spring:jar org.springframework:spring-beans:jar org.springframework:spring-context:jar org.springframework:spring-core:jar org.springframework:spring-web:jar logkit:logkit:jar - org.apache.tomcat:juli:jar javax.xml.bind:jsr173_api:jar jrms:jrms:jar activemq:jmdns:jar Propchan
svn commit: r981681 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/distribution/src/main/assembly/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kern
Author: veithen Date: Mon Aug 2 20:47:03 2010 New Revision: 981681 URL: http://svn.apache.org/viewvc?rev=981681&view=rev Log: Merged r981306 to the 1.5 branch after making sure that the set of unnecessary exclusions is indeed the same. 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/distribution/src/main/assembly/bin-assembly.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 2 20:47:03 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,981311 +/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 /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,801630,803725,805999,807160,807487,816740,834058,834175,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 2 20:47:03 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,981311 +/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 /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,801630,803725,805999,807160,807487,816740,834058,834175,904780,905980 Modified: axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/bin-assembly.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/bin-assembly.xml?rev=981681&r1=981680&r2=981681&view=diff == --- axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/bin-assembly.xml (original) +++ axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/bin-assembly.xml Mon Aug 2 20:47:03 2010 @@ -200,63 +200,21 @@ *:*:jar - mx4j:mx4j-jmx:jar - mx4j:mx4j-impl:jar - mx4j:mx4j-remote:jar - mx4j:mx4j-tools:jar - mx4j:mx4j:jar - rome:rome:jar org.apache.geronimo.specs:geronimo-activation_1.1_spec:jar - org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:jar - org.apache.geronimo.spec
