tharusha
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MDM-299 fix

Browse Source
revert-dabc3590
harshanL 10 years ago
parent f6c640ef57
commit b543337371
11 changed files with 42 additions and 28 deletions
Show Stats Download Patch File Download Diff File

25
pom.xml
Unescape View File

@ -490,32 +490,32 @@
<dependency>
<groupId>org.apache.wss4j</groupId>
<artifactId>wss4j-ws-security-common</artifactId>
<version>2.0.0</version>
<version>${apache.wss4j.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>1.49</version>
<version>${bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.49</version>
<version>${bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.0.21</version>
<version>${codehaus.plexus.version}</version>
</dependency>
<dependency>
<groupId>com.madgag.spongycastle</groupId>
<artifactId>pkix</artifactId>
<version>1.51.0.0</version>
<version>${spongycastle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
<version>2.6.1</version>
<version>${cxf.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@ -606,6 +606,19 @@
<!-- API Management -->
<carbon.api.mgt.version>4.3.0-SNAPSHOT</carbon.api.mgt.version>
<!-- Spongycastle Management-->
<spongycastle.version>1.51.0.0</spongycastle.version>
<!-- Bouncycastle Management-->
<bouncycastle.version>1.49</bouncycastle.version>
<!-- Apache wss4j Management-->
<apache.wss4j.version>2.0.0</apache.wss4j.version>
<!-- Codehaus Plexus Management-->
<codehaus.plexus.version>3.0.21</codehaus.plexus.version>
</properties>
<scm>

8
product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Device.java → product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/Device.java
Unescape View File

@ -15,12 +15,12 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.cdmserver.mobileservices.android;
package org.wso2.carbon.mdm.mobileservices.android;
import org.wso2.carbon.device.mgt.common.*;
import org.wso2.cdmserver.mobileservices.android.common.AndroidAgentException;
import org.wso2.cdmserver.mobileservices.android.util.AndroidAPIUtils;
import org.wso2.cdmserver.mobileservices.android.util.Message;
import org.wso2.carbon.mdm.mobileservices.android.util.AndroidAPIUtils;
import org.wso2.carbon.mdm.mobileservices.android.util.Message;
import org.wso2.carbon.mdm.mobileservices.android.common.AndroidAgentException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

8
product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Enrollment.java → product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/Enrollment.java
Unescape View File

@ -16,7 +16,7 @@
* under the License.
*/
package org.wso2.cdmserver.mobileservices.android;
package org.wso2.carbon.mdm.mobileservices.android;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -24,9 +24,9 @@ import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
import org.wso2.carbon.device.mgt.common.DeviceManagementException;
import org.wso2.carbon.device.mgt.common.DeviceManagementServiceException;
import org.wso2.cdmserver.mobileservices.android.common.AndroidAgentException;
import org.wso2.cdmserver.mobileservices.android.util.AndroidAPIUtils;
import org.wso2.cdmserver.mobileservices.android.util.Message;
import org.wso2.carbon.mdm.mobileservices.android.common.AndroidAgentException;
import org.wso2.carbon.mdm.mobileservices.android.util.AndroidAPIUtils;
import org.wso2.carbon.mdm.mobileservices.android.util.Message;
import javax.ws.rs.*;
import javax.ws.rs.core.Response;

9
product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Operation.java → product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/Operation.java
Unescape View File

@ -17,16 +17,17 @@
* under the License.
*/
package org.wso2.cdmserver.mobileservices.android;
package org.wso2.carbon.mdm.mobileservices.android;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.device.mgt.common.*;
import org.wso2.carbon.device.mgt.core.service.DeviceManagementService;
import org.wso2.cdmserver.mobileservices.android.common.AndroidAgentException;
import org.wso2.cdmserver.mobileservices.android.util.AndroidAPIUtils;
import org.wso2.cdmserver.mobileservices.android.util.Message;
import org.wso2.carbon.mdm.mobileservices.android.common.AndroidAgentException;
import org.wso2.carbon.mdm.mobileservices.android.util.AndroidAPIUtils;
import org.wso2.carbon.mdm.mobileservices.android.util.Message;
import javax.ws.rs.*;
import javax.ws.rs.core.Response;
import java.util.List;

2
product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/common/AndroidAgentException.java → product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/common/AndroidAgentException.java
Unescape View File

@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.cdmserver.mobileservices.android.common;
package org.wso2.carbon.mdm.mobileservices.android.common;
public class AndroidAgentException extends Exception{

2
product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/common/ErrorHandler.java → product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/common/ErrorHandler.java
Unescape View File

@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.cdmserver.mobileservices.android.common;
package org.wso2.carbon.mdm.mobileservices.android.common;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Response;

2
product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/common/ErrorMessage.java → product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/common/ErrorMessage.java
Unescape View File

@ -15,7 +15,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.cdmserver.mobileservices.android.common;
package org.wso2.carbon.mdm.mobileservices.android.common;
public class ErrorMessage {

2
product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidAPIUtils.java → product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/util/AndroidAPIUtils.java
Unescape View File

@ -16,7 +16,7 @@
* under the License.
*/
package org.wso2.cdmserver.mobileservices.android.util;
package org.wso2.carbon.mdm.mobileservices.android.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

2
product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidConstants.java → product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/util/AndroidConstants.java
Unescape View File

@ -16,7 +16,7 @@
* under the License.
*/
package org.wso2.cdmserver.mobileservices.android.util;
package org.wso2.carbon.mdm.mobileservices.android.util;
/**
* Defines constants used in Android-REST API bundle.

2
product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/Message.java → product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/carbon/mdm/mobileservices/android/util/Message.java
Unescape View File

@ -16,7 +16,7 @@
* under the License.
*/
package org.wso2.cdmserver.mobileservices.android.util;
package org.wso2.carbon.mdm.mobileservices.android.util;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;

8
product/modules/mobileservices/agents/android/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml
Unescape View File

@ -51,10 +51,10 @@
</jaxrs:providers>
</jaxrs:server>
<bean id="deviceMgtServiceBean" class="org.wso2.cdmserver.mobileservices.android.Device"/>
<bean id="enrollmentServiceBean" class="org.wso2.cdmserver.mobileservices.android.Enrollment"/>
<bean id="operationServiceBean" class="org.wso2.cdmserver.mobileservices.android.Operation"/>
<bean id="deviceMgtServiceBean" class="org.wso2.carbon.mdm.mobileservices.android.Device"/>
<bean id="enrollmentServiceBean" class="org.wso2.carbon.mdm.mobileservices.android.Enrollment"/>
<bean id="operationServiceBean" class="org.wso2.carbon.mdm.mobileservices.android.Operation"/>
<bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJsonProvider"/>
<bean id="errorHandler" class="org.wso2.cdmserver.mobileservices.android.common.ErrorHandler"/>
<bean id="errorHandler" class="org.wso2.carbon.mdm.mobileservices.android.common.ErrorHandler"/>
</beans>

Write Preview
Loading…
Cancel
Save