Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions modules/clustering/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -125,16 +125,10 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
<systemProperties>
<property>
<name>maven.test.haltafterfailure</name>
<value>false</value>
</property>
<property>
<name>run.clustering.tests</name>
<value>${run.clustering.tests}</value>
</property>
</systemProperties>
<systemPropertyVariables>
<maven.test.haltafterfailure>false</maven.test.haltafterfailure>
<run.clustering.tests>${run.clustering.tests}</run.clustering.tests>
</systemPropertyVariables>
<excludes>
<exclude>**/UpdateStateTest.java</exclude>
<exclude>**/ConfigurationManagerTest.java</exclude>
Expand Down
9 changes: 3 additions & 6 deletions modules/fastinfoset/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -259,12 +259,9 @@
<includes>
<include>**/*Test.java</include>
</includes>
<systemProperties>
<property>
<name>build.repository</name>
<value>./target/test-classes</value>
</property>
</systemProperties>
<systemPropertyVariables>
<build.repository>./target/test-classes</build.repository>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
Expand Down
19 changes: 5 additions & 14 deletions modules/integration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -578,21 +578,12 @@
<exclude>**/ComplexDataTypesDocLitBareTest.java</exclude>
<exclude>**/ComplexDataTypesTest.java</exclude>
</excludes>
<systemProperties>
<property>
<name>build.repository</name>
<value>./target/test-classes</value>
</property>
<systemPropertyVariables>
<build.repository>./target/test-classes</build.repository>
<!-- Prevent Mac OS X from showing an icon in the dock during the test run -->
<property>
<name>java.awt.headless</name>
<value>true</value>
</property>
<property>
<name>org.apache.axis2.transport.http.server.fastShutdown</name>
<value>true</value>
</property>
</systemProperties>
<java.awt.headless>true</java.awt.headless>
<org.apache.axis2.transport.http.server.fastShutdown>true</org.apache.axis2.transport.http.server.fastShutdown>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
Expand Down
1 change: 0 additions & 1 deletion modules/jaxbri-codegen/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
<forkMode>once</forkMode>
<includes>
<include>**/*Test.java</include>
</includes>
Expand Down
44 changes: 10 additions & 34 deletions modules/jaxws-integration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1387,41 +1387,17 @@
<include>**/*Test.java</include>
<include>**/*Tests.java</include>
</includes>
<systemProperties>
<property>
<name>javax.xml.accessExternalSchema</name>
<value>all</value>
</property>
<property>
<name>OASISCatalogManager.catalog.debug.level</name>
<value>0</value>
</property>
<property>
<name>jakarta.xml.soap.MessageFactory</name>
<value>org.apache.axis2.saaj.MessageFactoryImpl</value>
</property>
<property>
<name>jakarta.xml.soap.SOAPFactory</name>
<value>org.apache.axis2.saaj.SOAPFactoryImpl</value>
</property>
<property>
<name>jakarta.xml.soap.SOAPConnectionFactory</name>
<value>org.apache.axis2.saaj.SOAPConnectionFactoryImpl</value>
</property>
<property>
<name>jakarta.xml.soap.MetaFactory</name>
<value>org.apache.axis2.saaj.SAAJMetaFactoryImpl</value>
</property>
<systemPropertyVariables>
<javax.xml.accessExternalSchema>all</javax.xml.accessExternalSchema>
<OASISCatalogManager.catalog.debug.level>0</OASISCatalogManager.catalog.debug.level>
<jakarta.xml.soap.MessageFactory>org.apache.axis2.saaj.MessageFactoryImpl</jakarta.xml.soap.MessageFactory>
<jakarta.xml.soap.SOAPFactory>org.apache.axis2.saaj.SOAPFactoryImpl</jakarta.xml.soap.SOAPFactory>
<jakarta.xml.soap.SOAPConnectionFactory>org.apache.axis2.saaj.SOAPConnectionFactoryImpl</jakarta.xml.soap.SOAPConnectionFactory>
<jakarta.xml.soap.MetaFactory>org.apache.axis2.saaj.SAAJMetaFactoryImpl</jakarta.xml.soap.MetaFactory>
<!-- Prevent Mac OS X from showing an icon in the dock during the test run -->
<property>
<name>java.awt.headless</name>
<value>true</value>
</property>
<property>
<name>org.apache.axis2.transport.http.server.fastShutdown</name>
<value>true</value>
</property>
</systemProperties>
<java.awt.headless>true</java.awt.headless>
<org.apache.axis2.transport.http.server.fastShutdown>true</org.apache.axis2.transport.http.server.fastShutdown>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
</wsdl:message>

<wsdl:portType name="DocLitnonWrappedProxy">
<jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">
<jaxws:bindings xmlns:jaxws="https://jakarta.ee/xml/ns/jaxws">
<jaxws:enableWrapperStyle>false</jaxws:enableWrapperStyle>
<jaxws:enableAsyncMapping>true</jaxws:enableAsyncMapping>
</jaxws:bindings>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
</wsdl:message>

<wsdl:portType name="DocLitWrappedProxy">
<jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">
<jaxws:bindings xmlns:jaxws="https://jakarta.ee/xml/ns/jaxws">
<jaxws:enableAsyncMapping>true</jaxws:enableAsyncMapping>
</jaxws:bindings>

Expand Down
52 changes: 13 additions & 39 deletions modules/jaxws/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -342,54 +342,28 @@
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
<configuration>
<forkMode>once</forkMode>
<argLine>${argLine} -Xms256m -Xmx512m --add-opens java.base/java.net=ALL-UNNAMED</argLine>
<!-- Enable the next 2 lines if you want to attach a debugger
<argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006</argLine>-->
<includes>
<include>**/*Test.java</include>
<include>**/*Tests.java</include>
</includes>
<systemProperties>
<!--<property>
<name>OASISCatalogManager.catalog.debug.level</name>
<value>9999</value>
</property>-->
<property>
<name>build.repository</name>
<value>./target/test-classes</value>
</property>
<property>
<name>jakarta.xml.soap.MessageFactory</name>
<value>org.apache.axis2.saaj.MessageFactoryImpl</value>
</property>
<property>
<name>jakarta.xml.soap.SOAPFactory</name>
<value>org.apache.axis2.saaj.SOAPFactoryImpl</value>
</property>
<property>
<name>jakarta.xml.soap.SOAPConnectionFactory</name>
<value>org.apache.axis2.saaj.SOAPConnectionFactoryImpl</value>
</property>
<property>
<name>jakarta.xml.soap.MetaFactory</name>
<value>org.apache.axis2.saaj.SAAJMetaFactoryImpl</value>
</property>
<systemPropertyVariables>
<!--
<OASISCatalogManager.catalog.debug.level>9999</OASISCatalogManager.catalog.debug.level>
-->
<build.repository>./target/test-classes</build.repository>
<jakarta.xml.soap.MessageFactory>org.apache.axis2.saaj.MessageFactoryImpl</jakarta.xml.soap.MessageFactory>
<jakarta.xml.soap.SOAPFactory>org.apache.axis2.saaj.SOAPFactoryImpl</jakarta.xml.soap.SOAPFactory>
<jakarta.xml.soap.SOAPConnectionFactory>org.apache.axis2.saaj.SOAPConnectionFactoryImpl</jakarta.xml.soap.SOAPConnectionFactory>
<jakarta.xml.soap.MetaFactory>org.apache.axis2.saaj.SAAJMetaFactoryImpl</jakarta.xml.soap.MetaFactory>
<!-- Need this for the client side to pickup an axis2.xml to configure SoapMessageMUProviderChecker -->
<property>
<name>org.apache.axis2.jaxws.config.path</name>
<value>./target/test-classes/axis2.xml</value>
</property>
<property>
<name>org.apache.axis2.jaxws.repo.path</name>
<value>./target/repository</value>
</property>
<org.apache.axis2.jaxws.config.path>./target/test-classes/axis2.xml</org.apache.axis2.jaxws.config.path>
<org.apache.axis2.jaxws.repo.path>./target/repository</org.apache.axis2.jaxws.repo.path>
<!-- Prevent Mac OS X from showing an icon in the dock during the test run -->
<property>
<name>java.awt.headless</name>
<value>true</value>
</property>
</systemProperties>
<java.awt.headless>true</java.awt.headless>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -320,17 +320,10 @@ public void addMetaData(OMNode metaData) {

}

/**
* @deprecated
*/
public String getName() {
return name;
}

/**
* @param name
* @deprecated
*/
public void setName(String name) {
this.name = name;
}
Expand Down
5 changes: 5 additions & 0 deletions modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ public class BuilderUtil {
/**
* @deprecated
*/
@Deprecated
public static final int BOM_SIZE = 4;

public static SOAPEnvelope buildsoapMessage(MessageContext messageContext,
Expand Down Expand Up @@ -275,6 +276,7 @@ public static OMXMLParserWrapper createPOXBuilder(InputStream in, String encodin
* directly to the XML parser. If the stream is not XML, you shouldn't be using this
* method anyway.
*/
@Deprecated
public static Reader getReader(final InputStream is, final String charSetEncoding)
throws IOException {
final PushbackInputStream is2 = getPushbackInputStream(is);
Expand All @@ -298,6 +300,7 @@ public Object run() throws UnsupportedEncodingException {
* @deprecated If you need a {@link PushbackInputStream} just construct one (with the
* appropriate size).
*/
@Deprecated
public static PushbackInputStream getPushbackInputStream(InputStream is) {
return new PushbackInputStream(is, BOM_SIZE);
}
Expand All @@ -309,6 +312,7 @@ public static PushbackInputStream getPushbackInputStream(InputStream is) {
* probably you are using a {@link Reader} where you should use an
* {@link InputStream}.
*/
@Deprecated
public static String getCharSetEncoding(PushbackInputStream is2, String defaultEncoding)
throws IOException {
String encoding;
Expand Down Expand Up @@ -584,6 +588,7 @@ public static SOAPModelBuilder createSOAPModelBuilder(InputStream in, String enc
/**
* @deprecated Use {@link MessageProcessorSelector#getMessageBuilder(String, MessageContext)}.
*/
@Deprecated
public static Builder getBuilderFromSelector(String type, MessageContext msgContext)
throws AxisFault {
return MessageProcessorSelector.getMessageBuilder(type, msgContext);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ public boolean isAncestor(AbstractContext context) {
* @deprecated Use {@link #getPropertyNames()}, {@link #getProperty(String)},
* {@link #setProperty(String, Object)} & {@link #removeProperty(String)}instead.
*/
@Deprecated
public Map<String, Object> getProperties() {
initPropertiesMap();
return properties;
Expand Down
Loading