Author: elvisisking Date: 2010-09-22 17:09:06 -0400 (Wed, 22 Sep 2010) New Revision: 25109 Added: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/jcip-annotations.jar trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/modeshape-client.jar Removed: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/modeshape-web-jcr-rest-client-2.1-SNAPSHOT-jar-with-dependencies.jar trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/modeshape-web-jcr-rest-client-2.1-SNAPSHOT-sources.jar Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/.classpath trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/META-INF/MANIFEST.MF trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/build.properties trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/ServerManager.java trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/MockRestClient.java Log: JBIDE-6984 Upgraded ModeShape plugin to use latest ModeShape JDBC jar. Upgraded to latest ModeShape client jar that is available. Tested with the ModeShape 2.2.x Hudson build of Sep 22 10:56. Each release of JBT will require a new ModeShape client jar. Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/.classpath =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/.classpath 2010-09-22 21:05:55 UTC (rev 25108) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/.classpath 2010-09-22 21:09:06 UTC (rev 25109) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry exported="true" kind="lib" path="modeshape-web-jcr-rest-client-2.1-SNAPSHOT-jar-with-dependencies.jar" sourcepath="modeshape-web-jcr-rest-client-2.1-SNAPSHOT-sources.jar"/> + <classpathentry exported="true" kind="lib" path="modeshape-client.jar"/> + <classpathentry exported="true" kind="lib" path="jcip-annotations.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/META-INF/MANIFEST.MF =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/META-INF/MANIFEST.MF 2010-09-22 21:05:55 UTC (rev 25108) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/META-INF/MANIFEST.MF 2010-09-22 21:09:06 UTC (rev 25109) @@ -15,8 +15,10 @@ org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy -Bundle-ClassPath: modeshape-web-jcr-rest-client-2.1-SNAPSHOT-jar-with-dependencies.jar, +Bundle-ClassPath: modeshape-client.jar, + jcip-annotations.jar, . -Export-Package: org.jboss.tools.modeshape.rest, +Export-Package: javax.jcr.nodetype, + org.jboss.tools.modeshape.rest, org.modeshape.web.jcr.rest.client, org.modeshape.web.jcr.rest.client.domain Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/build.properties =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/build.properties 2010-09-22 21:05:55 UTC (rev 25108) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/build.properties 2010-09-22 21:09:06 UTC (rev 25109) @@ -21,7 +21,8 @@ .,\ docs/,\ about.html,\ - modeshape-web-jcr-rest-client-2.1-SNAPSHOT-jar-with-dependencies.jar + jcip-annotations.jar,\ + modeshape-client.jar src.includes = src/ jars.compile.order = . source.. = src/ Added: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/jcip-annotations.jar =================================================================== (Binary files differ) Property changes on: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/jcip-annotations.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/modeshape-client.jar =================================================================== (Binary files differ) Property changes on: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/modeshape-client.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/modeshape-web-jcr-rest-client-2.1-SNAPSHOT-jar-with-dependencies.jar =================================================================== (Binary files differ) Deleted: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/modeshape-web-jcr-rest-client-2.1-SNAPSHOT-sources.jar =================================================================== (Binary files differ) Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/ServerManager.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/ServerManager.java 2010-09-22 21:05:55 UTC (rev 25108) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/ServerManager.java 2010-09-22 21:09:06 UTC (rev 25109) @@ -19,9 +19,11 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; +import javax.jcr.nodetype.NodeType; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.OutputKeys; @@ -37,6 +39,7 @@ import org.modeshape.web.jcr.rest.client.IRestClient; import org.modeshape.web.jcr.rest.client.Status; import org.modeshape.web.jcr.rest.client.Status.Severity; +import org.modeshape.web.jcr.rest.client.domain.QueryRow; import org.modeshape.web.jcr.rest.client.domain.Repository; import org.modeshape.web.jcr.rest.client.domain.Server; import org.modeshape.web.jcr.rest.client.domain.Workspace; @@ -241,6 +244,7 @@ * @throws RuntimeException if the server is not registered * @see #isRegistered(Server) */ + @Override public Collection<Repository> getRepositories( Server server ) throws Exception { CheckArg.isNotNull(server, "server"); @@ -265,6 +269,7 @@ * @see org.modeshape.web.jcr.rest.client.IRestClient#getUrl(java.io.File, java.lang.String, * org.modeshape.web.jcr.rest.client.domain.Workspace) */ + @Override public URL getUrl( File file, String path, Workspace workspace ) throws Exception { @@ -278,6 +283,7 @@ * @throws RuntimeException if the server is not registered * @see #isRegistered(Server) */ + @Override public Collection<Workspace> getWorkspaces( Repository repository ) throws Exception { CheckArg.isNotNull(repository, "repository"); @@ -484,6 +490,7 @@ * java.lang.String, java.io.File) * @see #isRegistered(Server) */ + @Override public Status publish( Workspace workspace, String path, File file ) { @@ -626,6 +633,7 @@ * java.lang.String, java.io.File) * @see #isRegistered(Server) */ + @Override public Status unpublish( Workspace workspace, String path, File file ) { @@ -685,4 +693,68 @@ status.getException()); } + /** + * {@inheritDoc} + * + * @throws UnsupportedOperationException if this method is called + * @see org.modeshape.web.jcr.rest.client.IRestClient#getNodeTypes(org.modeshape.web.jcr.rest.client.domain.Workspace) + */ + @Override + public Map<String, NodeType> getNodeTypes( Workspace workspace ) throws Exception { + throw new UnsupportedOperationException(); + } + + /** + * {@inheritDoc} + * <p> + * <strong>This method is unsupported and should not be called.</strong> + * + * @throws UnsupportedOperationException if this method is called + * @see org.modeshape.web.jcr.rest.client.IRestClient#query(org.modeshape.web.jcr.rest.client.domain.Workspace, + * java.lang.String, java.lang.String) + */ + @Override + public List<QueryRow> query( Workspace arg0, + String arg1, + String arg2 ) throws Exception { + throw new UnsupportedOperationException(); + } + + /** + * {@inheritDoc} + * <p> + * <strong>This method is unsupported and should not be called.</strong> + * + * @throws UnsupportedOperationException if this method is called + * @see org.modeshape.web.jcr.rest.client.IRestClient#query(org.modeshape.web.jcr.rest.client.domain.Workspace, + * java.lang.String, java.lang.String, int, int) + */ + @Override + public List<QueryRow> query( Workspace arg0, + String arg1, + String arg2, + int arg3, + int arg4 ) throws Exception { + throw new UnsupportedOperationException(); + } + + /** + * {@inheritDoc} + * <p> + * <strong>This method is unsupported and should not be called.</strong> + * + * @throws UnsupportedOperationException if this method is called + * @see org.modeshape.web.jcr.rest.client.IRestClient#query(org.modeshape.web.jcr.rest.client.domain.Workspace, + * java.lang.String, java.lang.String, int, int, java.util.Map) + */ + @Override + public List<QueryRow> query( Workspace arg0, + String arg1, + String arg2, + int arg3, + int arg4, + Map<String, String> arg5 ) throws Exception { + throw new UnsupportedOperationException(); + } + } Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/MockRestClient.java =================================================================== --- trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/MockRestClient.java 2010-09-22 21:05:55 UTC (rev 25108) +++ trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest/MockRestClient.java 2010-09-22 21:09:06 UTC (rev 25109) @@ -14,8 +14,12 @@ import java.io.File; import java.net.URL; import java.util.Collection; +import java.util.List; +import java.util.Map; +import javax.jcr.nodetype.NodeType; import org.modeshape.web.jcr.rest.client.IRestClient; import org.modeshape.web.jcr.rest.client.Status; +import org.modeshape.web.jcr.rest.client.domain.QueryRow; import org.modeshape.web.jcr.rest.client.domain.Repository; import org.modeshape.web.jcr.rest.client.domain.Server; import org.modeshape.web.jcr.rest.client.domain.Workspace; @@ -25,15 +29,22 @@ */ public final class MockRestClient implements IRestClient { - // =========================================================================================================================== - // Methods - // =========================================================================================================================== + /** + * {@inheritDoc} + * + * @see org.modeshape.web.jcr.rest.client.IRestClient#getNodeTypes(org.modeshape.web.jcr.rest.client.domain.Workspace) + */ + @Override + public Map<String, NodeType> getNodeTypes( Workspace arg0 ) throws Exception { + return null; + } /** * {@inheritDoc} * * @see org.modeshape.web.jcr.rest.client.IRestClient#getRepositories(org.modeshape.web.jcr.rest.client.domain.Server) */ + @Override public Collection<Repository> getRepositories( Server server ) throws Exception { return null; } @@ -44,6 +55,7 @@ * @see org.modeshape.web.jcr.rest.client.IRestClient#getUrl(java.io.File, java.lang.String, * org.modeshape.web.jcr.rest.client.domain.Workspace) */ + @Override public URL getUrl( File file, String path, Workspace workspace ) throws Exception { @@ -55,6 +67,7 @@ * * @see org.modeshape.web.jcr.rest.client.IRestClient#getWorkspaces(org.modeshape.web.jcr.rest.client.domain.Repository) */ + @Override public Collection<Workspace> getWorkspaces( Repository repository ) throws Exception { return null; } @@ -65,6 +78,7 @@ * @see org.modeshape.web.jcr.rest.client.IRestClient#publish(org.modeshape.web.jcr.rest.client.domain.Workspace, * java.lang.String, java.io.File) */ + @Override public Status publish( Workspace workspace, String path, File file ) { @@ -77,10 +91,55 @@ * @see org.modeshape.web.jcr.rest.client.IRestClient#unpublish(org.modeshape.web.jcr.rest.client.domain.Workspace, * java.lang.String, java.io.File) */ + @Override public Status unpublish( Workspace workspace, String path, File file ) { return null; } + /** + * {@inheritDoc} + * + * @see org.modeshape.web.jcr.rest.client.IRestClient#query(org.modeshape.web.jcr.rest.client.domain.Workspace, + * java.lang.String, java.lang.String) + */ + @Override + public List<QueryRow> query( Workspace arg0, + String arg1, + String arg2 ) throws Exception { + return null; + } + + /** + * {@inheritDoc} + * + * @see org.modeshape.web.jcr.rest.client.IRestClient#query(org.modeshape.web.jcr.rest.client.domain.Workspace, + * java.lang.String, java.lang.String, int, int) + */ + @Override + public List<QueryRow> query( Workspace arg0, + String arg1, + String arg2, + int arg3, + int arg4 ) throws Exception { + return null; + } + + /** + * {@inheritDoc} + * + * @see org.modeshape.web.jcr.rest.client.IRestClient#query(org.modeshape.web.jcr.rest.client.domain.Workspace, + * java.lang.String, java.lang.String, int, int, java.util.Map) + */ + @Override + public List<QueryRow> query( Workspace arg0, + String arg1, + String arg2, + int arg3, + int arg4, + Map<String, String> arg5 ) throws Exception { + return null; + } + }