Further refactoring to make existing plugins protocol specific.

Author: Gary Brown

distribution/pom.xml

@@ -42,7 +42,7 @@
     </dependency>
     <dependency>
       <groupId>org.scribble.modules</groupId>
-      <artifactId>org.scribble.core</artifactId>
+      <artifactId>org.scribble.common</artifactId>
       <version>${scribble.version}</version>
     </dependency>
     <dependency>

docs/developerguide/src/main/module/architecture.xml

@@ -76,7 +76,7 @@
 			There is a generic logging API within the Scribble
 			framework that can be used for reporting errors,
 			warnings, information or debuging details.
-			This API is <emphasis>org.scribble.core.logging.ScribbleLogger</emphasis>.
+			This API is <emphasis>org.scribble.common.logging.ScribbleLogger</emphasis>.
 			</para>
 
 			<para>
@@ -108,9 +108,9 @@
 				</para>	
 
 				<programlisting>
-logger.error(org.scribble.core.util.MessageUtil.format(
+logger.error(org.scribble.common.util.MessageUtil.format(
 				java.util.PropertyResourceBundle.getBundle(
-						"org.scribble.core.validation.rules.Messages"),
+						"org.scribble.common.validation.rules.Messages"),
 										"_EXISTING_DECLARATION",
 										new String[]{elem.getName()}),
 										obj.getProperties());
@@ -172,20 +172,20 @@ _EXISTING_DECLARATION=Declaration already exists for name '{0}'
 		</section>
 
 		<section>
-			<title>Validation Manager and Validators</title>
+			<title>Protocol Validation Manager and Validators</title>
 
 			<para>
 			The validation manager, when used in a OSGi runtime
 			environment, will listen for the activation of any
 			implementations of the
-			<filename>org.scribble.core.validation.Validator</filename>
+			<filename>org.scribble.protocol.validation.Validator</filename>
 			interface.
 			</para>
 
 			<para>
 			This means that the validation of any model can be
 			performed using the 
-			<emphasis>org.scribble.core.validation.ValidationManager</emphasis>,
+			<emphasis>org.scribble.protocol.validation.ValidationManager</emphasis>,
 			rather than having to obtain instances of
 			multiple implementations of the <filename>Validator</filename>
 			interface.

docs/developerguide/src/main/module/validator.xml

@@ -115,7 +115,7 @@
 		avoids dependency on specific bundles, and instead
 		just identifies the packages required). For this
 		example validator, we just need to add the packages
-		from the <emphasis>org.scribble.core</emphasis> bundle
+		from the <emphasis>org.scribble.common</emphasis> bundle
 		which is used by all Scribble plugins. However if
 		additional packages were required, then they could be
 		added as imported packages.
@@ -135,12 +135,12 @@
 		model, but possibly only be interested in certain parts
 		of it. Therefore usually the validation modules will
 		define an implementation of the
-		<filename>org.scribble.core.model.Visitor</filename> interface.
+		<filename>org.scribble.protocol.model.Visitor</filename> interface.
 		</para>
 
 		<para>
 		The actual main class within the validator module would
-		implement the <filename>org.scribble.core.validation.Validator</filename>
+		implement the <filename>org.scribble.protocol.validation.Validator</filename>
 		interface.
 		</para>
 	</section>

integration/eclipse/features/org.scribble.protocol.feature/feature.xml

@@ -18,7 +18,7 @@
    </license>
 
    <plugin
-         id="org.scribble.core"
+         id="org.scribble.common"
          download-size="0"
          install-size="0"
          version="0.0.0"

integration/eclipse/plugins/org.scribble.designer/META-INF/MANIFEST.MF

@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.ltk.core.refactoring,
  org.eclipse.ui.ide,
- org.scribble.core,
+ org.scribble.common,
  org.scribble.protocol,
  org.scribble.protocol.parser
 Bundle-ActivationPolicy: lazy

integration/eclipse/plugins/org.scribble.designer/src/java/org/scribble/designer/logger/EclipseScribbleLogger.java

@@ -20,7 +20,7 @@
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IMarker;
-import org.scribble.core.logger.ScribbleLogger;
+import org.scribble.common.logger.ScribbleLogger;
 
 public class EclipseScribbleLogger implements ScribbleLogger {
 

modules/org.scribble.command/META-INF/MANIFEST.MF

@@ -5,9 +5,9 @@ Bundle-Version: 1.0.0
 Bundle-Activator: org.scribble.command.osgi.Activator
 Export-Package: org.scribble.command
 Import-Package: org.osgi.framework,
- org.scribble.conformance,
- org.scribble.core.logger,
- org.scribble.protocol.validation,
+ org.scribble.common.logger,
+ org.scribble.protocol.conformance,
  org.scribble.protocol.model,
- org.scribble.protocol.parser
+ org.scribble.protocol.parser,
+ org.scribble.protocol.validation
 Bundle-SymbolicName: org.scribble.command

modules/org.scribble.command/pom.xml

@@ -21,7 +21,7 @@
     </dependency>
     <dependency>
       <groupId>org.scribble.modules</groupId>
-      <artifactId>org.scribble.core</artifactId>
+      <artifactId>org.scribble.common</artifactId>
       <version>${scribble.version}</version>
     </dependency>
     <dependency>
@@ -31,7 +31,7 @@
     </dependency>
     <dependency>
       <groupId>org.scribble.modules</groupId>
-      <artifactId>org.scribble.conformance</artifactId>
+      <artifactId>org.scribble.protocol.conformance</artifactId>
       <version>${scribble.version}</version>
     </dependency>
     <dependency>

modules/org.scribble.command/src/main/java/org/scribble/command/conforms/ConformsCommand.java

@@ -16,8 +16,8 @@
  */
 package org.scribble.command.conforms;
 
-import org.scribble.conformance.Conformer;
-import org.scribble.core.logger.ScribbleLogger;
+import org.scribble.common.logger.ScribbleLogger;
+import org.scribble.protocol.conformance.Conformer;
 import org.scribble.protocol.model.Protocol;
 import org.scribble.protocol.parser.ProtocolParser;
 

modules/org.scribble.command/src/main/java/org/scribble/command/osgi/Activator.java

@@ -28,8 +28,8 @@
 import org.scribble.command.parse.ParseCommand;
 import org.scribble.command.validate.ValidateCommand;
 import org.scribble.command.*;
-import org.scribble.conformance.Conformer;
-import org.scribble.core.logger.ScribbleLogger;
+import org.scribble.common.logger.ScribbleLogger;
+import org.scribble.protocol.conformance.Conformer;
 import org.scribble.protocol.parser.ProtocolParser;
 import org.scribble.protocol.validation.ValidationManager;
 

modules/org.scribble.command/src/main/java/org/scribble/command/parse/ParseCommand.java

@@ -16,7 +16,7 @@
  */
 package org.scribble.command.parse;
 
-import org.scribble.core.logger.ScribbleLogger;
+import org.scribble.common.logger.ScribbleLogger;
 import org.scribble.protocol.parser.ProtocolParser;
 
 public class ParseCommand implements org.scribble.command.Command {

modules/org.scribble.command/src/main/java/org/scribble/command/validate/ValidateCommand.java

@@ -16,7 +16,7 @@
  */
 package org.scribble.command.validate;
 
-import org.scribble.core.logger.*;
+import org.scribble.common.logger.*;
 import org.scribble.protocol.model.Protocol;
 import org.scribble.protocol.parser.ProtocolParser;
 import org.scribble.protocol.validation.ValidationManager;

modules/org.scribble.core/.classpath modules/org.scribble.common/.classpath

@@ -4,7 +4,6 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/2.0.1/org.apache.felix.framework-2.0.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin"/>

modules/org.scribble.core/.project modules/org.scribble.common/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.scribble.core</name>
+	<name>org.scribble.common</name>
 	<comment></comment>
 	<projects>
 	</projects>

modules/org.scribble.core/.settings/org.eclipse.pde.core.prefs modules/org.scribble.common/.settings/org.eclipse.pde.core.prefs

@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Scribble Common
+Bundle-SymbolicName: org.scribble.common
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.scribble.common.osgi.Activator
+Bundle-Vendor: www.scribble.org
+Import-Package: org.osgi.framework,
+ org.osgi.util.tracker
+Export-Package: org.scribble.common.logger,
+ org.scribble.common.util

modules/org.scribble.common/META-INF/MANIFEST.MF

@@ -2,10 +2,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.scribble.modules</groupId>
-  <artifactId>org.scribble.core</artifactId>
+  <artifactId>org.scribble.common</artifactId>
   <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
-  <name>Scribble::Modules::Core</name>
+  <name>Scribble::Modules::Common</name>
 
   <parent>
     <groupId>org.scribble</groupId>

modules/org.scribble.conformance/build.properties modules/org.scribble.common/build.properties

@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.scribble.core.logger;
+package org.scribble.common.logger;
 
 import java.io.Serializable;
 import java.util.Map;

modules/org.scribble.core/pom.xml modules/org.scribble.common/pom.xml

@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.scribble.core.logger;
+package org.scribble.common.logger;
 
 import java.io.Serializable;
 

modules/org.scribble.core/src/main/java/org/scribble/core/logger/CachedScribbleLogger.java modules/org.scribble.common/src/main/java/org/scribble/common/logger/CachedScribbleLogger.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.scribble.core.logger;
+package org.scribble.common.logger;
 
 public enum IssueType {
 	Debug,

modules/org.scribble.core/src/main/java/org/scribble/core/logger/ConsoleScribbleLogger.java modules/org.scribble.common/src/main/java/org/scribble/common/logger/ConsoleScribbleLogger.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.scribble.core.logger;
+package org.scribble.common.logger;
 
 import java.io.Serializable;
 

modules/org.scribble.core/src/main/java/org/scribble/core/logger/IssueType.java modules/org.scribble.common/src/main/java/org/scribble/common/logger/IssueType.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.scribble.core.osgi;
+package org.scribble.common.osgi;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;

modules/org.scribble.core/src/main/java/org/scribble/core/logger/ScribbleLogger.java modules/org.scribble.common/src/main/java/org/scribble/common/logger/ScribbleLogger.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.scribble.core.util;
+package org.scribble.common.util;
 
 /**
  * This class provides utility functions related to

modules/org.scribble.core/src/main/java/org/scribble/core/osgi/Activator.java modules/org.scribble.common/src/main/java/org/scribble/common/osgi/Activator.java

@@ -14,11 +14,13 @@
  * limitations under the License.
  *
  */
-package org.scribble.core.logger;
+package org.scribble.common.logger;
 
 import java.io.Serializable;
 import java.util.Map;
 
+import org.scribble.common.logger.ScribbleLogger;
+
 import static org.junit.Assert.*;
 
 public class TestScribbleLogger implements ScribbleLogger {

modules/org.scribble.core/src/main/java/org/scribble/core/util/MessageUtil.java modules/org.scribble.common/src/main/java/org/scribble/common/util/MessageUtil.java

@@ -14,10 +14,12 @@
  * limitations under the License.
  *
  */
-package org.scribble.core.util;
+package org.scribble.common.util;
 
 import static org.junit.Assert.*;
 
+import org.scribble.common.util.MessageUtil;
+
 public class MessageUtilTest {
 
 	@org.junit.Test

modules/org.scribble.core/src/test/java/org/scribble/core/logger/TestScribbleLogger.java modules/org.scribble.common/src/test/java/org/scribble/common/logger/TestScribbleLogger.java

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.scribble.conformance</name>
+	<name>org.scribble.protocol.conformance</name>
 	<comment></comment>
 	<projects>
 	</projects>

modules/org.scribble.core/src/test/java/org/scribble/core/util/MessageUtilTest.java modules/org.scribble.common/src/test/java/org/scribble/common/util/MessageUtilTest.java

@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Scribble Protocol Conformance
+Bundle-SymbolicName: org.scribble.protocol.conformance
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.scribble.protocol.conformance.osgi.Activator
+Bundle-Vendor: www.scribble.org
+Import-Package: org.osgi.framework;version="1.3.0",
+ org.scribble.common.logger,
+ org.scribble.common.util,
+ org.scribble.protocol.model
+Export-Package: org.scribble.protocol.conformance

modules/org.scribble.conformance/META-INF/MANIFEST.MF

@@ -2,10 +2,10 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.scribble.modules</groupId>
-  <artifactId>org.scribble.conformance</artifactId>
+  <artifactId>org.scribble.protocol.conformance</artifactId>
   <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
-  <name>Scribble::Modules::Conformance</name>
+  <name>Scribble::Modules::Protocol::Conformance</name>
 
   <parent>
     <groupId>org.scribble</groupId>
@@ -16,7 +16,7 @@
   <dependencies>
     <dependency>
       <groupId>org.scribble.modules</groupId>
-      <artifactId>org.scribble.core</artifactId>
+      <artifactId>org.scribble.common</artifactId>
       <version>${scribble.version}</version>
     </dependency>
     <dependency>

modules/org.scribble.core/META-INF/MANIFEST.MF

@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-package org.scribble.conformance;
+package org.scribble.protocol.conformance;
 
 import org.scribble.protocol.model.*;