svn commit: r1351218 - in /axis/axis2/java/core/trunk: pom.xml src/site/site.xml
Author: sagara Date: Mon Jun 18 07:16:01 2012 New Revision: 1351218 URL: http://svn.apache.org/viewvc?rev=1351218&view=rev Log: Applied patch for AXIS2-5345. Modified: axis/axis2/java/core/trunk/pom.xml axis/axis2/java/core/trunk/src/site/site.xml Modified: axis/axis2/java/core/trunk/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1351218&r1=1351217&r2=1351218&view=diff == --- axis/axis2/java/core/trunk/pom.xml (original) +++ axis/axis2/java/core/trunk/pom.xml Mon Jun 18 07:16:01 2012 @@ -600,7 +600,7 @@ maven-site-plugin -2.1.1 +3.1 Modified: axis/axis2/java/core/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/src/site/site.xml?rev=1351218&r1=1351217&r2=1351218&view=diff == --- axis/axis2/java/core/trunk/src/site/site.xml (original) +++ axis/axis2/java/core/trunk/src/site/site.xml Mon Jun 18 07:16:01 2012 @@ -67,7 +67,7 @@ - +
svn commit: r1351222 - in /axis/axis2/java/core/branches/1_6: ./ pom.xml src/site/site.xml
Author: sagara Date: Mon Jun 18 07:27:10 2012 New Revision: 1351222 URL: http://svn.apache.org/viewvc?rev=1351222&view=rev Log: AXIS2-5345 - Merged r1351218 to 1.6 branch. Modified: axis/axis2/java/core/branches/1_6/ (props changed) axis/axis2/java/core/branches/1_6/pom.xml axis/axis2/java/core/branches/1_6/src/site/site.xml Propchange: axis/axis2/java/core/branches/1_6/ -- Merged /axis/axis2/java/core/trunk:r1351218 Modified: axis/axis2/java/core/branches/1_6/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/pom.xml?rev=1351222&r1=1351221&r2=1351222&view=diff == --- axis/axis2/java/core/branches/1_6/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/pom.xml Mon Jun 18 07:27:10 2012 @@ -597,7 +597,7 @@ maven-site-plugin -2.1.1 +3.1 Modified: axis/axis2/java/core/branches/1_6/src/site/site.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/src/site/site.xml?rev=1351222&r1=1351221&r2=1351222&view=diff == --- axis/axis2/java/core/branches/1_6/src/site/site.xml (original) +++ axis/axis2/java/core/branches/1_6/src/site/site.xml Mon Jun 18 07:27:10 2012 @@ -67,7 +67,7 @@ - +
svn commit: r1351224 - in /axis/axis2/java/core/branches/1_5: ./ modules/distribution/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/axis2/transport/http/util
Author: sagara Date: Mon Jun 18 07:28:48 2012 New Revision: 1351224 URL: http://svn.apache.org/viewvc?rev=1351224&view=rev Log: AXIS2-5345 - Merged r1351218 to 1.5 branch. Modified: axis/axis2/java/core/branches/1_5/ (props changed) axis/axis2/java/core/branches/1_5/modules/distribution/ (props changed) axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java (props changed) axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java (props changed) axis/axis2/java/core/branches/1_5/modules/parent/ (props changed) axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/applet/ (props changed) axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/src/main/java/org/apache/axis2/soapmonitor/servlet/ (props changed) axis/axis2/java/core/branches/1_5/modules/tool/axis2-repo-maven-plugin/ (props changed) axis/axis2/java/core/branches/1_5/modules/transport/http/pom.xml (props changed) axis/axis2/java/core/branches/1_5/modules/transport/http/src/ (props changed) axis/axis2/java/core/branches/1_5/modules/transport/local/ (props changed) axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java (props changed) axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java (props changed) axis/axis2/java/core/branches/1_5/pom.xml axis/axis2/java/core/branches/1_5/src/site/site.xml Propchange: axis/axis2/java/core/branches/1_5/ -- Merged /axis/axis2/java/core/trunk:r1351218 Propchange: axis/axis2/java/core/branches/1_5/modules/distribution/ -- Merged /axis/axis2/java/core/trunk/modules/distribution:r1351218 Propchange: axis/axis2/java/core/branches/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java -- Merged /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:r1351218 Propchange: axis/axis2/java/core/branches/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java -- Merged /axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:r1351218 Propchange: axis/axis2/java/core/branches/1_5/modules/parent/ -- Merged /axis/axis2/java/core/trunk/modules/parent:r1351218 Propchange: axis/axis2/java/core/branches/1_5/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java -- Merged /axis/axis2/java/core/trunk/modules/saaj/test/org/apache/axis2/saaj/TestUtils.java:r1351218 Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/ -- Merged /axis/axis2/java/core/trunk/modules/soapmonitor/module:r1351218 Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/pom.xml -- Merged /axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml:r1351218 Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers/ -- Merged /axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/java/org/apache/axis2/handlers:r1351218 Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/module/src/main/resources/META-INF/module.xml -- Merged /axis/axis2/java/core/trunk/modules/soapmonitor/module/src/main/resources/META-INF/module.xml:r1351218 Propchange: axis/axis2/java/core/branches/1_5/modules/soapmonitor/servlet/ ---
svn commit: r1351238 - in /axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/schemas/custom_schemas: XSD2JAVA1/ XSD2JAVA2/ XSD2JAVA3/ XSD2JAVA4/
Author: sagara Date: Mon Jun 18 08:45:05 2012 New Revision: 1351238 URL: http://svn.apache.org/viewvc?rev=1351238&view=rev Log: AXIS2-5335 - Removed generated files stored under SVN sources. please see https://issues.apache.org/jira/browse/AXIS2-5335?focusedCommentId=13395483&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13395483 Removed: axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/schemas/custom_schemas/XSD2JAVA1/ axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/schemas/custom_schemas/XSD2JAVA2/ axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/schemas/custom_schemas/XSD2JAVA3/ axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/schemas/custom_schemas/XSD2JAVA4/
svn commit: r1351243 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2: context/ConfigurationContext.java deployment/repository/util/DeploymentFileData.java transport/TransportListe
Author: sagara
Date: Mon Jun 18 08:51:16 2012
New Revision: 1351243
URL: http://svn.apache.org/viewvc?rev=1351243&view=rev
Log:
AXIS2-5315 - removed another set of deprecated methods from kernel.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportListener.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java?rev=1351243&r1=1351242&r2=1351243&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
Mon Jun 18 08:51:16 2012
@@ -588,13 +588,6 @@ public class ConfigurationContext extend
return ids;
}
-/**
- * @return The ServiceGroupContexts
- * @deprecated Use {@link #getServiceGroupContextIDs} & {@link
#getServiceGroupContext(String)}
- */
-public Hashtable getServiceGroupContexts() {
-return serviceGroupContextMap;
-}
/**
* Returns the thread factory.
@@ -915,14 +908,6 @@ public class ConfigurationContext extend
}
/**
- * @deprecated MISSPELLING - Please use
getServiceGroupContextTimeoutInterval()
- * @return the service group context timeout interval
- */
-public long getServiceGroupContextTimoutInterval() {
-return getServiceGroupContextTimeoutInterval();
-}
-
-/**
* This will be used to fetch the serviceGroupContextTimoutInterval from
any place available.
*
* @return the service group context timeout interval (in milliseconds)
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java?rev=1351243&r1=1351242&r2=1351243&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/repository/util/DeploymentFileData.java
Mon Jun 18 08:51:16 2012
@@ -85,15 +85,6 @@ public class DeploymentFileData {
return file.getName(); // No need to check for null due to constructor
check
}
-/**
- * Get the name of the file.
- *
- * @return the name of the referenced file
- * @deprecated please use getName() instead - this will disappear after
1.3.
- */
-public String getServiceName() {
-return getName();
-}
public static boolean isModuleArchiveFile(String filename) {
return (filename.endsWith(".mar"));
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportListener.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportListener.java?rev=1351243&r1=1351242&r2=1351243&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportListener.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportListener.java
Mon Jun 18 08:51:16 2012
@@ -43,15 +43,6 @@ public interface TransportListener {
void stop() throws AxisFault;
/**
- * @param serviceName
- * @param ip
- * @throws AxisFault
- * @deprecated Transport listener can expose more than EPRs. So this
method should return an array of EPRs.
- * Deprecating this method for now and please use
getEPRsForServices instead.
- */
-EndpointReference getEPRForService(String serviceName, String ip) throws
AxisFault;
-
-/**
* Get the endpoint references for a given service. These are the
addresses that a client
* can use to send requests to the given service through this transport.
*
svn commit: r1351245 - /axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/LifecycleFixTransportListenerProxy.java
Author: sagara
Date: Mon Jun 18 08:53:57 2012
New Revision: 1351245
URL: http://svn.apache.org/viewvc?rev=1351245&view=rev
Log:
Changes according to AXIS2-5315 r1351243 .
Modified:
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/LifecycleFixTransportListenerProxy.java
Modified:
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/LifecycleFixTransportListenerProxy.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/LifecycleFixTransportListenerProxy.java?rev=1351245&r1=1351244&r2=1351245&view=diff
==
---
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/LifecycleFixTransportListenerProxy.java
(original)
+++
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/util/LifecycleFixTransportListenerProxy.java
Mon Jun 18 08:53:57 2012
@@ -41,9 +41,9 @@ public class LifecycleFixTransportListen
}
@SuppressWarnings("deprecation")
-public EndpointReference getEPRForService(String arg0, String arg1)
+public EndpointReference[] getEPRForService(String arg0, String arg1)
throws AxisFault {
-return target.getEPRForService(arg0, arg1);
+return target.getEPRsForService(arg0, arg1);
}
public EndpointReference[] getEPRsForService(String arg0, String arg1)
svn commit: r1351246 - /axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/XSD2JavaTest.java
Author: sagara
Date: Mon Jun 18 08:59:05 2012
New Revision: 1351246
URL: http://svn.apache.org/viewvc?rev=1351246&view=rev
Log:
AXIS2-5335 - Aplied test case correction for adb-codegen test cases.
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/XSD2JavaTest.java
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/XSD2JavaTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/XSD2JavaTest.java?rev=1351246&r1=1351245&r2=1351246&view=diff
==
---
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/XSD2JavaTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/XSD2JavaTest.java
Mon Jun 18 08:59:05 2012
@@ -33,8 +33,9 @@ public class XSD2JavaTest extends XMLSch
if (file.exists()) {
XSD2Java.main(new String[] { SampleSchemasDirectory +
"sampleSchema" + i + ".xsd",
-SampleSchemasDirectory+"XSD2JAVA" + i });
-File temp=new File(SampleSchemasDirectory+"XSD2JAVA" + i );
+"target" + File.separator + "generated" +
File.separator + "XSD2JAVA" + i });
+File temp = new File("target" + File.separator + "generated" +
File.separator
++ "XSD2JAVA" + i);
//checks whether XSD2Java executed successfully
assertTrue(temp.exists());
}
