Skip to content

Commit

Permalink
Merge pull request #5792 from srallapa/SP-6628-backporting-PPP-4174
Browse files Browse the repository at this point in the history 
[SP-6628] backporting PPP-4174 Migrate axis2 web services to jax-rs and remove axis2
  • Loading branch information
@ddiroma
ddiroma authored Nov 21, 2024
2 parents 16c7e2a + 1222b6b commit 9b39ed7
Show file tree
Hide file tree
Showing 35 changed files with 1 addition and 7,484 deletions.
Binary file added api/.DS_Store
View file
Binary file not shown.
283 changes: 0 additions & 283 deletions ...blies/pentaho-solutions/src/main/resources/pentaho-solutions/system/axis/axis2_config.xml
View file

This file was deleted.

11 changes: 0 additions & 11 deletions ...s/pentaho-solutions/src/main/resources/pentaho-solutions/system/default-plugin/plugin.xml
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<plugin title="BI Server default plugin">

<!-- Commented out per BISERVER-13533
<content-generator id="ws-services" type="ws-services" title="Web services discovery page"
class="org.pentaho.platform.plugin.services.webservices.content.StyledHtmlAxisServiceLister"/>
-->
<content-generator id="ws-run" type="ws-run" title="Web services execution"
class="org.pentaho.platform.plugin.services.webservices.content.AxisServiceExecutor"/>
<!-- Commented out per BISERVER-13533
<content-generator id="ws-wsdl" type="ws-wsdl" title="Web services execution"
class="org.pentaho.platform.plugin.services.webservices.content.AxisServiceWsdlGenerator"/>
-->

<perspective id="home.perspective" title="${home}" layout-priority="-2"
resourcebundle="content/default-plugin/resources/messages/messages" content-url="mantle/home">
</perspective>
Expand Down
4 changes: 0 additions & 4 deletions ...s/pentaho-solutions/src/main/resources/pentaho-solutions/system/pentahoObjects.spring.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<property name="serviceTypeManagers">
<list>
<ref bean="gwtServiceManager"/>
<ref bean="axisServiceManager"/>
</list>
</property>
</bean>
<bean id="ITempFileDeleter" class="org.pentaho.platform.web.http.session.SessionTempFileDeleter" scope="prototype"/>
<bean id="gwtServiceManager" class="org.pentaho.platform.plugin.services.pluginmgr.servicemgr.GwtRpcServiceManager"
scope="singleton"/>
<bean id="axisServiceManager" class="org.pentaho.platform.plugin.services.pluginmgr.servicemgr.AxisWebServiceManager"
scope="singleton"/>

<bean id="IChartBeansGenerator" class="org.pentaho.platform.plugin.action.chartbeans.DefaultChartBeansGenerator"
scope="singleton"/>

Expand Down
6 changes: 0 additions & 6 deletions assemblies/pentaho-war/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -865,12 +865,6 @@
<groupId>org.mozilla</groupId>
<artifactId>rhino</artifactId>
</dependency>
<!-- commons-httpclient - Needed for axis2 1.5 version -->
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
Expand Down
60 changes: 0 additions & 60 deletions extensions/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -582,66 +582,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb</artifactId>
<version>${axis2.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-codegen</artifactId>
<version>${axis2.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
<version>${axis2.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.pentaho.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
<version>${axis2.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
<version>${axis2.version}</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
<groupId>*</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
Expand Down
Loading

0 comments on commit 9b39ed7

Please sign in to comment.