Author: elvisisking Date: 2012-04-13 17:00:42 -0400 (Fri, 13 Apr 2012) New Revision: 40186 Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.client/META-INF/MANIFEST.MF trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/META-INF/MANIFEST.MF trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/preferences/CndPreferencePage.java 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/tests/org.jboss.tools.modeshape.rest.test/META-INF/MANIFEST.MF Log: JBIDE-11538 Remove ModeShape Client JAR From ModeShape Tools REST Plugin And Add Dependency To ModeShape Tools Client Plugin. A new binary plugin with the client jar used by ModeShape Tools now exists. So removed the JAR and added dependency to this new plugin. Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.client/META-INF/MANIFEST.MF =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.client/META-INF/MANIFEST.MF 2012-04-13 18:24:03 UTC (rev 40185) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.client/META-INF/MANIFEST.MF 2012-04-13 21:00:42 UTC (rev 40186) @@ -17,6 +17,86 @@ javax.jcr.security, javax.jcr.util, javax.jcr.version, + javax.ws.rs, + javax.ws.rs.core, + javax.ws.rs.ext, + org.apache.commons.codec, + org.apache.commons.codec.binary, + org.apache.commons.codec.digest, + org.apache.commons.codec.language, + org.apache.commons.codec.net, + org.apache.commons.logging, + org.apache.commons.logging.impl, + org.apache.http, + org.apache.http.auth, + org.apache.http.auth.params, + org.apache.http.client, + org.apache.http.client.entity, + org.apache.http.client.methods, + org.apache.http.client.params, + org.apache.http.client.protocol, + org.apache.http.client.utils, + org.apache.http.conn, + org.apache.http.conn.params, + org.apache.http.conn.routing, + org.apache.http.conn.scheme, + org.apache.http.conn.ssl, + org.apache.http.conn.util, + org.apache.http.cookie, + org.apache.http.cookie.params, + org.apache.http.entity, + org.apache.http.impl, + org.apache.http.impl.auth, + org.apache.http.impl.client, + org.apache.http.impl.conn, + org.apache.http.impl.conn.tsccm, + org.apache.http.impl.cookie, + org.apache.http.impl.entity, + org.apache.http.impl.io, + org.apache.http.io, + org.apache.http.message, + org.apache.http.params, + org.apache.http.protocol, + org.apache.http.util, + org.codehaus.jettison, + org.codehaus.jettison.badgerfish, + org.codehaus.jettison.json, + org.codehaus.jettison.mapped, + org.codehaus.jettison.util, + org.jboss.resteasy.annotations, + org.jboss.resteasy.annotations.cache, + org.jboss.resteasy.annotations.interception, + org.jboss.resteasy.annotations.providers.img, + org.jboss.resteasy.annotations.providers.jaxb, + org.jboss.resteasy.annotations.providers.jaxb.json, + org.jboss.resteasy.client, + org.jboss.resteasy.client.cache, + org.jboss.resteasy.client.core, + org.jboss.resteasy.client.core.executors, + org.jboss.resteasy.client.core.marshallers, + org.jboss.resteasy.core, + org.jboss.resteasy.core.interception, + org.jboss.resteasy.core.messagebody, + org.jboss.resteasy.core.registry, + org.jboss.resteasy.core.request, + org.jboss.resteasy.mock, + org.jboss.resteasy.plugins.delegates, + org.jboss.resteasy.plugins.interceptors, + org.jboss.resteasy.plugins.interceptors.encoding, + org.jboss.resteasy.plugins.providers, + org.jboss.resteasy.plugins.providers.jaxb, + org.jboss.resteasy.plugins.providers.jaxb.json, + org.jboss.resteasy.plugins.server.embedded, + org.jboss.resteasy.plugins.server.resourcefactory, + org.jboss.resteasy.plugins.server.servlet, + org.jboss.resteasy.plugins.server.tjws, + org.jboss.resteasy.plugins.stats, + org.jboss.resteasy.specimpl, + org.jboss.resteasy.spi, + org.jboss.resteasy.spi.interception, + org.jboss.resteasy.spi.touri, + org.jboss.resteasy.test, + org.jboss.resteasy.util, org.modeshape.common, org.modeshape.common.annotation, org.modeshape.common.collection, @@ -40,4 +120,7 @@ org.modeshape.web.jcr.rest.client, org.modeshape.web.jcr.rest.client.domain, org.modeshape.web.jcr.rest.client.http, - org.modeshape.web.jcr.rest.client.json + org.modeshape.web.jcr.rest.client.json, + org.slf4j, + org.slf4j.helpers, + org.slf4j.spi Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/META-INF/MANIFEST.MF 2012-04-13 18:24:03 UTC (rev 40185) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/META-INF/MANIFEST.MF 2012-04-13 21:00:42 UTC (rev 40186) @@ -15,5 +15,5 @@ org.eclipse.ui.editors, org.eclipse.jface.text, org.eclipse.ui.ide, - org.jboss.tools.modeshape.client;bundle-version="1.1.0" + org.jboss.tools.modeshape.client Bundle-Activator: org.jboss.tools.modeshape.jcr.ui.Activator Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/preferences/CndPreferencePage.java =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/preferences/CndPreferencePage.java 2012-04-13 18:24:03 UTC (rev 40185) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr.ui/src/org/jboss/tools/modeshape/jcr/ui/preferences/CndPreferencePage.java 2012-04-13 21:00:42 UTC (rev 40186) @@ -31,10 +31,10 @@ * */ public final class CndPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { +// +// private static String[] QUOTE_CHAR_LABELS = new String[] { CndMessages.quoteCharNoneChoiceLabel, +// CndMessages.quoteCharSingleChoiceLabel, CndMessages.quoteCharDoubleChoiceLabel }; - private static String[] QUOTE_CHAR_LABELS = new String[] { CndMessages.quoteCharNoneChoiceLabel, - CndMessages.quoteCharSingleChoiceLabel, CndMessages.quoteCharDoubleChoiceLabel }; - /** * The editor used to choose the notation type for the CND format. */ Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/.classpath =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/.classpath 2012-04-13 18:24:03 UTC (rev 40185) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/.classpath 2012-04-13 21:00:42 UTC (rev 40186) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <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"/> 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 2012-04-13 18:24:03 UTC (rev 40185) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/META-INF/MANIFEST.MF 2012-04-13 21:00:42 UTC (rev 40186) @@ -13,16 +13,12 @@ org.eclipse.jface.text, org.eclipse.debug.ui, org.jboss.tools.usage;bundle-version="1.0.0";resolution:=optional, - org.eclipse.ui.views + org.eclipse.ui.views, + org.jboss.tools.modeshape.client Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy -Bundle-ClassPath: modeshape-client.jar, - jcip-annotations.jar, +Bundle-ClassPath: jcip-annotations.jar, . -Export-Package: javax.jcr.nodetype, - org.jboss.tools.modeshape.rest, +Export-Package: org.jboss.tools.modeshape.rest, org.jboss.tools.modeshape.rest.domain, - org.jboss.tools.modeshape.rest.preferences, - org.modeshape.common.i18n, - org.modeshape.web.jcr.rest.client, - org.modeshape.web.jcr.rest.client.domain + org.jboss.tools.modeshape.rest.preferences Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/build.properties =================================================================== --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/build.properties 2012-04-13 18:24:03 UTC (rev 40185) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/build.properties 2012-04-13 21:00:42 UTC (rev 40186) @@ -21,7 +21,6 @@ .,\ about.html,\ jcip-annotations.jar,\ - modeshape-client.jar,\ .options jars.compile.order = . source.. = src/ Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/META-INF/MANIFEST.MF =================================================================== --- trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/META-INF/MANIFEST.MF 2012-04-13 18:24:03 UTC (rev 40185) +++ trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/META-INF/MANIFEST.MF 2012-04-13 21:00:42 UTC (rev 40186) @@ -5,7 +5,8 @@ Bundle-Version: 1.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.jboss.tools.modeshape.rest, - org.junit4 + org.junit4, + org.jboss.tools.modeshape.client Bundle-ClassPath: hamcrest-core-1.1.jar, ., junit-4.4.jar