Author: adietish Date: 2011-09-13 07:45:38 -0400 (Tue, 13 Sep 2011) New Revision: 34668 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/ Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/ Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/OpenshiftService.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/AbstractJsonMarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/AbstractOpenshiftMarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/ApplicationRequestJsonMarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/DomainRequestJsonMarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/IOpenshiftMarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/IOpenshiftRequest.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/ListCartridgesRequestJsonMarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/UserInfoRequestJsonMarshaller.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/AbstractOpenshiftRequest.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ApplicationTest.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainTest.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ListCartridgesTest.java trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/UserInfoTest.java Log: [JBIDE-9510] corrected package structure Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF 2011-09-13 11:09:13 UTC (rev 34667) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/META-INF/MANIFEST.MF 2011-09-13 11:45:38 UTC (rev 34668) @@ -13,7 +13,7 @@ . Export-Package: org.jboss.dmr;x-friends:="org.jboss.ide.eclipse.as.openshift.test", org.jboss.ide.eclipse.as.openshift.core, - org.jboss.ide.eclipse.as.openshift.core.internal.marshalling;x-friends:="org.jboss.ide.eclipse.as.openshift.test", org.jboss.ide.eclipse.as.openshift.internal.core;x-friends:="org.jboss.ide.eclipse.as.openshift.test", + org.jboss.ide.eclipse.as.openshift.internal.core.marshalling;x-friends:="org.jboss.ide.eclipse.as.openshift.test", org.jboss.ide.eclipse.as.openshift.internal.core.request;x-friends:="org.jboss.ide.eclipse.as.openshift.test", org.jboss.ide.eclipse.as.openshift.internal.core.response;x-friends:="org.jboss.ide.eclipse.as.openshift.test" Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/OpenshiftService.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/OpenshiftService.java 2011-09-13 11:09:13 UTC (rev 34667) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/OpenshiftService.java 2011-09-13 11:45:38 UTC (rev 34668) @@ -25,13 +25,13 @@ import org.jboss.ide.eclipse.as.openshift.core.SSHKey; import org.jboss.ide.eclipse.as.openshift.core.Status; import org.jboss.ide.eclipse.as.openshift.core.UserInfo; -import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.ApplicationRequestJsonMarshaller; -import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.DomainRequestJsonMarshaller; -import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.ListCartridgesRequestJsonMarshaller; -import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.UserInfoRequestJsonMarshaller; import org.jboss.ide.eclipse.as.openshift.internal.core.httpclient.HttpClientException; import org.jboss.ide.eclipse.as.openshift.internal.core.httpclient.UnauthorizedException; import org.jboss.ide.eclipse.as.openshift.internal.core.httpclient.UrlConnectionHttpClient; +import org.jboss.ide.eclipse.as.openshift.internal.core.marshalling.ApplicationRequestJsonMarshaller; +import org.jboss.ide.eclipse.as.openshift.internal.core.marshalling.DomainRequestJsonMarshaller; +import org.jboss.ide.eclipse.as.openshift.internal.core.marshalling.ListCartridgesRequestJsonMarshaller; +import org.jboss.ide.eclipse.as.openshift.internal.core.marshalling.UserInfoRequestJsonMarshaller; import org.jboss.ide.eclipse.as.openshift.internal.core.request.AbstractDomainRequest; import org.jboss.ide.eclipse.as.openshift.internal.core.request.ApplicationAction; import org.jboss.ide.eclipse.as.openshift.internal.core.request.ApplicationRequest; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/AbstractJsonMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/AbstractJsonMarshaller.java 2011-09-12 14:17:02 UTC (rev 34637) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/AbstractJsonMarshaller.java 2011-09-13 11:45:38 UTC (rev 34668) @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling; +package org.jboss.ide.eclipse.as.openshift.internal.core.marshalling; import org.jboss.dmr.ModelNode; import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftJsonConstants; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/AbstractOpenshiftMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/AbstractOpenshiftMarshaller.java 2011-09-12 14:17:02 UTC (rev 34637) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/AbstractOpenshiftMarshaller.java 2011-09-13 11:45:38 UTC (rev 34668) @@ -1,4 +1,4 @@ -package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling; +package org.jboss.ide.eclipse.as.openshift.internal.core.marshalling; public abstract class AbstractOpenshiftMarshaller<REQUEST extends IOpenshiftRequest> implements IOpenshiftMarshaller<REQUEST> { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/ApplicationRequestJsonMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/ApplicationRequestJsonMarshaller.java 2011-09-12 14:17:02 UTC (rev 34637) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/ApplicationRequestJsonMarshaller.java 2011-09-13 11:45:38 UTC (rev 34668) @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling; +package org.jboss.ide.eclipse.as.openshift.internal.core.marshalling; import org.jboss.dmr.ModelNode; import org.jboss.ide.eclipse.as.openshift.core.Cartridge; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/DomainRequestJsonMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/DomainRequestJsonMarshaller.java 2011-09-12 14:17:02 UTC (rev 34637) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/DomainRequestJsonMarshaller.java 2011-09-13 11:45:38 UTC (rev 34668) @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling; +package org.jboss.ide.eclipse.as.openshift.internal.core.marshalling; import org.jboss.dmr.ModelNode; import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftJsonConstants; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/IOpenshiftMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftMarshaller.java 2011-09-12 14:17:02 UTC (rev 34637) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/IOpenshiftMarshaller.java 2011-09-13 11:45:38 UTC (rev 34668) @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling; +package org.jboss.ide.eclipse.as.openshift.internal.core.marshalling; import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/IOpenshiftRequest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/IOpenshiftRequest.java 2011-09-12 14:17:02 UTC (rev 34637) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/IOpenshiftRequest.java 2011-09-13 11:45:38 UTC (rev 34668) @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling; +package org.jboss.ide.eclipse.as.openshift.internal.core.marshalling; /** * @author André Dietisheim Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/ListCartridgesRequestJsonMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/ListCartridgesRequestJsonMarshaller.java 2011-09-12 14:17:02 UTC (rev 34637) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/ListCartridgesRequestJsonMarshaller.java 2011-09-13 11:45:38 UTC (rev 34668) @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling; +package org.jboss.ide.eclipse.as.openshift.internal.core.marshalling; import org.jboss.dmr.ModelNode; import org.jboss.ide.eclipse.as.openshift.core.IOpenshiftJsonConstants; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/UserInfoRequestJsonMarshaller.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/core/internal/marshalling/UserInfoRequestJsonMarshaller.java 2011-09-12 14:17:02 UTC (rev 34637) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/marshalling/UserInfoRequestJsonMarshaller.java 2011-09-13 11:45:38 UTC (rev 34668) @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.ide.eclipse.as.openshift.core.internal.marshalling; +package org.jboss.ide.eclipse.as.openshift.internal.core.marshalling; import org.jboss.ide.eclipse.as.openshift.internal.core.request.UserInfoRequest; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/AbstractOpenshiftRequest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/AbstractOpenshiftRequest.java 2011-09-13 11:09:13 UTC (rev 34667) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.core/src/org/jboss/ide/eclipse/as/openshift/internal/core/request/AbstractOpenshiftRequest.java 2011-09-13 11:45:38 UTC (rev 34668) @@ -13,7 +13,7 @@ import java.net.MalformedURLException; import java.net.URL; -import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.IOpenshiftRequest; +import org.jboss.ide.eclipse.as.openshift.internal.core.marshalling.IOpenshiftRequest; import org.jboss.ide.eclipse.as.openshift.internal.core.utils.UrlBuilder; /** Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ApplicationTest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ApplicationTest.java 2011-09-13 11:09:13 UTC (rev 34667) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ApplicationTest.java 2011-09-13 11:45:38 UTC (rev 34668) @@ -15,7 +15,7 @@ import java.net.URLEncoder; import org.jboss.ide.eclipse.as.openshift.core.Cartridge; -import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.ApplicationRequestJsonMarshaller; +import org.jboss.ide.eclipse.as.openshift.internal.core.marshalling.ApplicationRequestJsonMarshaller; import org.jboss.ide.eclipse.as.openshift.internal.core.request.ApplicationAction; import org.jboss.ide.eclipse.as.openshift.internal.core.request.ApplicationRequest; import org.jboss.ide.eclipse.as.openshift.internal.core.request.OpenshiftJsonRequestFactory; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainTest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainTest.java 2011-09-13 11:09:13 UTC (rev 34667) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/DomainTest.java 2011-09-13 11:45:38 UTC (rev 34668) @@ -21,7 +21,7 @@ import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; import org.jboss.ide.eclipse.as.openshift.core.SSHKey; import org.jboss.ide.eclipse.as.openshift.core.User; -import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.DomainRequestJsonMarshaller; +import org.jboss.ide.eclipse.as.openshift.internal.core.marshalling.DomainRequestJsonMarshaller; import org.jboss.ide.eclipse.as.openshift.internal.core.request.ChangeDomainRequest; import org.jboss.ide.eclipse.as.openshift.internal.core.request.CreateDomainRequest; import org.jboss.ide.eclipse.as.openshift.internal.core.request.OpenshiftJsonRequestFactory; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ListCartridgesTest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ListCartridgesTest.java 2011-09-13 11:09:13 UTC (rev 34667) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/ListCartridgesTest.java 2011-09-13 11:45:38 UTC (rev 34668) @@ -18,7 +18,7 @@ import org.jboss.ide.eclipse.as.openshift.core.Cartridge; import org.jboss.ide.eclipse.as.openshift.core.OpenshiftException; -import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.ListCartridgesRequestJsonMarshaller; +import org.jboss.ide.eclipse.as.openshift.internal.core.marshalling.ListCartridgesRequestJsonMarshaller; import org.jboss.ide.eclipse.as.openshift.internal.core.request.ListCartridgesRequest; import org.jboss.ide.eclipse.as.openshift.internal.core.request.OpenshiftJsonRequestFactory; import org.jboss.ide.eclipse.as.openshift.internal.core.response.JsonSanitizer; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/UserInfoTest.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/UserInfoTest.java 2011-09-13 11:09:13 UTC (rev 34667) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.test/src/org/jboss/ide/eclipse/as/openshift/internal/test/core/UserInfoTest.java 2011-09-13 11:45:38 UTC (rev 34668) @@ -14,7 +14,7 @@ import java.net.URLEncoder; -import org.jboss.ide.eclipse.as.openshift.core.internal.marshalling.UserInfoRequestJsonMarshaller; +import org.jboss.ide.eclipse.as.openshift.internal.core.marshalling.UserInfoRequestJsonMarshaller; import org.jboss.ide.eclipse.as.openshift.internal.core.request.OpenshiftJsonRequestFactory; import org.jboss.ide.eclipse.as.openshift.internal.core.request.UserInfoRequest; import org.junit.Test;