savara SVN: r554 - in branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common: osgi and 1 other directory.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-07 14:18:56 -0500 (Fri, 07 Jan 2011)
New Revision: 554
Added:
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/osgi/
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/osgi/Activator.java
Removed:
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/osgi/Activator.java
Log:
Copied: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/osgi (from rev 502, branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/core/osgi)
Deleted: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/osgi/Activator.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/core/osgi/Activator.java 2010-12-10 22:38:20 UTC (rev 502)
+++ branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/osgi/Activator.java 2011-01-07 19:18:56 UTC (rev 554)
@@ -1,30 +0,0 @@
-package org.savara.core.osgi;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-
- private static BundleContext context;
-
- static BundleContext getContext() {
- return context;
- }
-
- /*
- * (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext bundleContext) throws Exception {
- Activator.context = bundleContext;
- }
-
- /*
- * (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext bundleContext) throws Exception {
- Activator.context = null;
- }
-
-}
Copied: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/osgi/Activator.java (from rev 518, branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/core/osgi/Activator.java)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/osgi/Activator.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/osgi/Activator.java 2011-01-07 19:18:56 UTC (rev 554)
@@ -0,0 +1,47 @@
+package org.savara.common.osgi;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.scribble.protocol.parser.ProtocolParserManager;
+import org.scribble.protocol.projection.ProtocolProjector;
+
+public class Activator implements BundleActivator {
+
+ private static BundleContext context;
+
+ static BundleContext getContext() {
+ return context;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext bundleContext) throws Exception {
+ Activator.context = bundleContext;
+
+ // Initialize the protocol parser manager
+ ServiceReference sref=context.getServiceReference(ProtocolParserManager.class.getName());
+
+ ProtocolParserManager ppm=(ProtocolParserManager)context.getService(sref);
+
+ org.savara.common.util.ScribbleServices.setParserManager(ppm);
+
+ // Initialize the protocol projector
+ sref=context.getServiceReference(ProtocolProjector.class.getName());
+
+ ProtocolProjector pp=(ProtocolProjector)context.getService(sref);
+
+ org.savara.common.util.ScribbleServices.setProtocolProjector(pp);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext bundleContext) throws Exception {
+ Activator.context = null;
+ }
+
+}
13 years, 5 months
savara SVN: r553 - in branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model: util and 1 other directory.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-07 14:17:31 -0500 (Fri, 07 Jan 2011)
New Revision: 553
Added:
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/util/
Modified:
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/util/InteractionUtil.java
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/util/PropertyNames.java
Log:
Copied: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/util (from rev 539, branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/util)
Modified: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/util/InteractionUtil.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/util/InteractionUtil.java 2011-01-07 15:57:52 UTC (rev 539)
+++ branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/util/InteractionUtil.java 2011-01-07 19:17:31 UTC (rev 553)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.savara.model.util;
+package org.savara.common.model.util;
import java.util.logging.Logger;
Modified: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/util/PropertyNames.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/util/PropertyNames.java 2011-01-07 15:57:52 UTC (rev 539)
+++ branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/util/PropertyNames.java 2011-01-07 19:17:31 UTC (rev 553)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.savara.model.util;
+package org.savara.common.model.util;
public class PropertyNames {
13 years, 5 months
savara SVN: r552 - in branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model: generator and 1 other directory.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-07 14:16:30 -0500 (Fri, 07 Jan 2011)
New Revision: 552
Added:
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/generator/
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/generator/ModelGenerator.java
Removed:
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/generator/DefaultModelGenerator.java
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/generator/ModelGenerator.java
Log:
Copied: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/generator (from rev 506, branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/generator)
Deleted: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/generator/DefaultModelGenerator.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/generator/DefaultModelGenerator.java 2010-12-16 16:32:57 UTC (rev 506)
+++ branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/generator/DefaultModelGenerator.java 2011-01-07 19:16:30 UTC (rev 552)
@@ -1,52 +0,0 @@
-/*
- * Copyright 2005-8 Pi4 Technologies Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- * Change History:
- * 24 Jul 2008 : Initial version created by gary
- */
-package org.savara.model.generator;
-
-import org.savara.model.change.AbstractModelChangeContext;
-import org.scribble.protocol.model.*;
-
-/**
- * This class represents a default implementation of the model
- * generator interface.
- */
-public class DefaultModelGenerator implements ModelGenerator {
-
- /**
- * This method generates the contents of the target
- * model using information in the source model. This
- * mechanism is used to create a new instance of the
- * model, but with a specific underlying representation.
- *
- * @param targetRef The target model's reference
- * @param role The role associated with the model
- * @param target The model being generated
- * @param source The reference model
- */
- public void generate(ModelReference targetRef, Role role,
- ProtocolModel target, ProtocolModel source) {
-
- AbstractModelChangeContext context=
- new AbstractModelChangeContext(targetRef, role);
- context.setParent(target);
-
- context.insert(target, source, null);
- }
-
-}
Deleted: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/generator/ModelGenerator.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/generator/ModelGenerator.java 2010-12-16 16:32:57 UTC (rev 506)
+++ branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/generator/ModelGenerator.java 2011-01-07 19:16:30 UTC (rev 552)
@@ -1,51 +0,0 @@
-/*
- * Copyright 2005-8 Pi4 Technologies Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- * Change History:
- * 24 Jul 2008 : Initial version created by gary
- */
-package org.savara.model.generator;
-
-import org.scribble.common.logging.Journal;
-import org.scribble.protocol.model.*;
-
-/**
- * This interface represents a model generator.
- */
-public interface ModelGenerator {
-
- /**
- * This method determines whether the generator is appropriate for
- * the specified source and target types.
- *
- * @param sourceType The source type
- * @param targetType The target type
- * @return Whether the specified types are supported
- */
- public boolean isSupported(String sourceType, String targetType);
-
- /**
- * This method generates the contents of the target
- * model using information in the source model.
- *
- * @param targetRef The target model's reference
- * @param role The role associated with the model
- * @param target The model being generated
- * @param source The reference model
- */
- public Object generate(Object source, Journal journal);
-
-}
Copied: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/generator/ModelGenerator.java (from rev 511, branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/generator/ModelGenerator.java)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/generator/ModelGenerator.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/generator/ModelGenerator.java 2011-01-07 19:16:30 UTC (rev 552)
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2005-8 Pi4 Technologies Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *
+ * Change History:
+ * 24 Jul 2008 : Initial version created by gary
+ */
+package org.savara.common.model.generator;
+
+import org.scribble.common.resource.ResourceLocator;
+import org.scribble.common.logging.Journal;
+
+/**
+ * This interface represents a model generator.
+ */
+public interface ModelGenerator {
+
+ /**
+ * This method determines whether the generator is appropriate for
+ * the specified source and target types.
+ *
+ * @param sourceType The source type
+ * @param targetType The target type
+ * @return Whether the specified types are supported
+ */
+ public boolean isSupported(String sourceType, String targetType);
+
+ /**
+ * This method generates the contents of the target
+ * model using information in the source model.
+ *
+ * @param source The source model
+ * @param journal The log
+ * @param locator The resource locator
+ * @return The target model
+ */
+ public Object generate(Object source, Journal journal, ResourceLocator locator);
+
+}
13 years, 5 months
savara SVN: r551 - in branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara: common and 2 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-07 14:16:04 -0500 (Fri, 07 Jan 2011)
New Revision: 551
Added:
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/change/
Modified:
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/change/AbstractModelChangeContext.java
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/change/AbstractModelChangeRule.java
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/change/ModelChangeContext.java
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/change/ModelChangeRule.java
Log:
Copied: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/change (from rev 506, branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/change)
Modified: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/change/AbstractModelChangeContext.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/change/AbstractModelChangeContext.java 2010-12-16 16:32:57 UTC (rev 506)
+++ branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/change/AbstractModelChangeContext.java 2011-01-07 19:16:04 UTC (rev 551)
@@ -17,7 +17,7 @@
* Change History:
* 24 Jul 2008 : Initial version created by gary
*/
-package org.savara.model.change;
+package org.savara.common.model.change;
import org.scribble.protocol.model.*;
Modified: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/change/AbstractModelChangeRule.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/change/AbstractModelChangeRule.java 2010-12-16 16:32:57 UTC (rev 506)
+++ branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/change/AbstractModelChangeRule.java 2011-01-07 19:16:04 UTC (rev 551)
@@ -17,7 +17,7 @@
* Change History:
* 28 Jul 2008 : Initial version created by gary
*/
-package org.savara.model.change;
+package org.savara.common.model.change;
import org.scribble.protocol.model.*;
Modified: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/change/ModelChangeContext.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/change/ModelChangeContext.java 2010-12-16 16:32:57 UTC (rev 506)
+++ branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/change/ModelChangeContext.java 2011-01-07 19:16:04 UTC (rev 551)
@@ -17,7 +17,7 @@
* Change History:
* 24 Jul 2008 : Initial version created by gary
*/
-package org.savara.model.change;
+package org.savara.common.model.change;
import org.scribble.protocol.model.*;
Modified: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/change/ModelChangeRule.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/change/ModelChangeRule.java 2010-12-16 16:32:57 UTC (rev 506)
+++ branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/model/change/ModelChangeRule.java 2011-01-07 19:16:04 UTC (rev 551)
@@ -17,7 +17,7 @@
* Change History:
* 23 Jul 2008 : Initial version created by gary
*/
-package org.savara.model.change;
+package org.savara.common.model.change;
import org.scribble.protocol.model.*;
13 years, 5 months
savara SVN: r550 - in branches/experimental/2.0.x: tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator and 1 other directory.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-07 14:15:34 -0500 (Fri, 07 Jan 2011)
New Revision: 550
Modified:
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java
branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java
Log:
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java 2011-01-07 19:14:39 UTC (rev 549)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java 2011-01-07 19:15:34 UTC (rev 550)
@@ -23,7 +23,7 @@
import org.pi4soa.cdl.*;
import org.pi4soa.cdl.util.CDLTypeUtil;
-import org.savara.model.util.PropertyNames;
+import org.savara.common.model.util.PropertyNames;
import org.scribble.protocol.model.*;
public class ProtocolModelConverterRuleImpl implements ConverterRule {
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java 2011-01-07 19:14:39 UTC (rev 549)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java 2011-01-07 19:15:34 UTC (rev 550)
@@ -35,12 +35,12 @@
import org.savara.bpel.generator.ProtocolToBPELModelGenerator;
import org.savara.bpel.model.*;
import org.savara.bpel.util.BPELModelUtil;
+import org.savara.common.model.util.PropertyNames;
+import org.savara.common.util.XMLUtils;
import org.savara.contract.model.Contract;
import org.savara.contract.model.Interface;
import org.savara.contract.model.Namespace;
import org.savara.core.eclipse.ScribbleServices;
-import org.savara.model.util.PropertyNames;
-import org.savara.util.XMLUtils;
import org.savara.wsdl.generator.WSDLGeneratorFactory;
import org.savara.wsdl.generator.soap.SOAPDocLitWSDLBinding;
import org.scribble.common.logging.CachedJournal;
13 years, 5 months
savara SVN: r549 - in branches/experimental/2.0.x/bundles: org.savara.bpel/src/test/java/org/savara/bpel/model/change and 3 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-07 14:14:39 -0500 (Fri, 07 Jan 2011)
New Revision: 549
Modified:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/BPELInteractionUtil.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/model/change/ModelChangeUtilsTest.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java
branches/experimental/2.0.x/bundles/org.savara.core/META-INF/MANIFEST.MF
Log:
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/BPELInteractionUtil.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/BPELInteractionUtil.java 2011-01-07 19:11:25 UTC (rev 548)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/BPELInteractionUtil.java 2011-01-07 19:14:39 UTC (rev 549)
@@ -33,8 +33,8 @@
import org.savara.bpel.model.TProcess;
import org.savara.bpel.model.TScope;
import org.savara.bpel.model.TSequence;
+import org.savara.common.util.XMLUtils;
import org.scribble.common.resource.ResourceLocator;
-import org.savara.util.XMLUtils;
/**
* This class contains utility functions for dealing with Interactions.
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/model/change/ModelChangeUtilsTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/model/change/ModelChangeUtilsTest.java 2011-01-07 19:11:25 UTC (rev 548)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/model/change/ModelChangeUtilsTest.java 2011-01-07 19:14:39 UTC (rev 549)
@@ -18,8 +18,8 @@
package org.savara.bpel.model.change;
import org.savara.bpel.model.change.ModelChangeUtils;
+import org.savara.common.model.change.ModelChangeContext;
import org.savara.contract.model.*;
-import org.savara.model.change.ModelChangeContext;
import org.scribble.protocol.model.*;
import junit.framework.TestCase;
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-07 19:11:25 UTC (rev 548)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-07 19:14:39 UTC (rev 549)
@@ -24,8 +24,8 @@
import org.savara.bpel.model.TProcess;
import org.savara.bpel.util.BPELModelUtil;
-import org.savara.model.generator.ModelGenerator;
-import org.savara.model.util.PropertyNames;
+import org.savara.common.model.generator.ModelGenerator;
+import org.savara.common.model.util.PropertyNames;
import org.scribble.common.logging.CachedJournal;
import org.savara.pi4soa.cdm.parser.CDMProtocolParser;
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java 2011-01-07 19:11:25 UTC (rev 548)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java 2011-01-07 19:14:39 UTC (rev 549)
@@ -24,6 +24,7 @@
import java.text.MessageFormat;
import java.util.logging.Logger;
+import org.savara.common.model.util.InteractionUtil;
import org.savara.contract.model.Contract;
import org.savara.contract.model.Interface;
import org.savara.contract.model.MessageExchangePattern;
@@ -31,7 +32,6 @@
import org.savara.contract.model.RequestResponseMEP;
import org.savara.contract.model.Type;
import org.savara.contract.model.TypeDefinition;
-import org.savara.model.util.InteractionUtil;
import org.scribble.protocol.model.AbstractModelObjectVisitor;
import org.scribble.protocol.model.Protocol;
import org.scribble.protocol.model.Interaction;
Modified: branches/experimental/2.0.x/bundles/org.savara.core/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.core/META-INF/MANIFEST.MF 2011-01-07 19:11:25 UTC (rev 548)
+++ branches/experimental/2.0.x/bundles/org.savara.core/META-INF/MANIFEST.MF 2011-01-07 19:14:39 UTC (rev 549)
@@ -3,14 +3,14 @@
Bundle-Name: SAVARA Core
Bundle-SymbolicName: org.savara.core;singleton:=true
Bundle-Version: 2.0.0.SNAPSHOT
-Bundle-Activator: org.savara.core.osgi.Activator
+Bundle-Activator: org.savara.common.osgi.Activator
Bundle-Vendor: www.savara.org
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="1.3.0"
Require-Bundle: org.scribble.common,
org.scribble.protocol
-Export-Package: org.savara.model.change,
- org.savara.model.generator,
- org.savara.model.util,
- org.savara.util
+Export-Package: org.savara.common.model.change,
+ org.savara.common.model.generator,
+ org.savara.common.model.util,
+ org.savara.common.util
Bundle-ActivationPolicy: lazy
13 years, 5 months
savara SVN: r548 - in branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel: model/change and 1 other directory.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-07 14:11:25 -0500 (Fri, 07 Jan 2011)
New Revision: 548
Modified:
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/ProtocolToBPELModelGenerator.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/AbstractBPELModelChangeRule.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/BPELModelChangeContext.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionModelChangeRule.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionPatterns.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ModelChangeUtils.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ProtocolModelChangeRule.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ProtocolModelModelChangeRule.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/RepeatModelChangeRule.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/RunModelChangeRule.java
Log:
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/ProtocolToBPELModelGenerator.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/ProtocolToBPELModelGenerator.java 2011-01-07 17:17:42 UTC (rev 547)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/ProtocolToBPELModelGenerator.java 2011-01-07 19:11:25 UTC (rev 548)
@@ -22,7 +22,7 @@
import org.savara.bpel.BPELDefinitions;
import org.savara.bpel.model.TProcess;
import org.savara.bpel.model.change.BPELModelChangeContext;
-import org.savara.model.generator.ModelGenerator;
+import org.savara.common.model.generator.ModelGenerator;
import org.scribble.common.resource.ResourceLocator;
import org.scribble.common.logging.Journal;
import org.scribble.protocol.ProtocolDefinitions;
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/AbstractBPELModelChangeRule.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/AbstractBPELModelChangeRule.java 2011-01-07 17:17:42 UTC (rev 547)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/AbstractBPELModelChangeRule.java 2011-01-07 19:11:25 UTC (rev 548)
@@ -20,7 +20,7 @@
import org.savara.bpel.BPELDefinitions;
import org.savara.bpel.model.TProcess;
import org.savara.bpel.model.TSequence;
-import org.savara.model.change.*;
+import org.savara.common.model.change.*;
import org.scribble.protocol.model.*;
/**
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/BPELModelChangeContext.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/BPELModelChangeContext.java 2011-01-07 17:17:42 UTC (rev 547)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/BPELModelChangeContext.java 2011-01-07 19:11:25 UTC (rev 548)
@@ -19,8 +19,8 @@
*/
package org.savara.bpel.model.change;
-import org.savara.model.change.AbstractModelChangeContext;
-import org.savara.model.change.ModelChangeRule;
+import org.savara.common.model.change.AbstractModelChangeContext;
+import org.savara.common.model.change.ModelChangeRule;
/**
* This class provides a default implementation for the model
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java 2011-01-07 17:17:42 UTC (rev 547)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java 2011-01-07 19:11:25 UTC (rev 548)
@@ -37,10 +37,10 @@
import org.savara.bpel.model.TVariable;
import org.savara.bpel.util.PartnerLinkUtil;
import org.savara.bpel.util.VariableUtil;
+import org.savara.common.model.change.ModelChangeContext;
+import org.savara.common.model.util.InteractionUtil;
import org.savara.contract.model.Contract;
import org.savara.contract.model.Interface;
-import org.savara.model.change.ModelChangeContext;
-import org.savara.model.util.InteractionUtil;
import org.savara.wsdl.util.WSDLGeneratorUtil;
import org.scribble.protocol.model.*;
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionModelChangeRule.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionModelChangeRule.java 2011-01-07 17:17:42 UTC (rev 547)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionModelChangeRule.java 2011-01-07 19:11:25 UTC (rev 548)
@@ -33,10 +33,10 @@
import org.savara.bpel.model.TVariable;
import org.savara.bpel.util.PartnerLinkUtil;
import org.savara.bpel.util.VariableUtil;
+import org.savara.common.model.change.ModelChangeContext;
+import org.savara.common.model.util.InteractionUtil;
import org.savara.contract.model.Contract;
import org.savara.contract.model.Interface;
-import org.savara.model.change.ModelChangeContext;
-import org.savara.model.util.InteractionUtil;
import org.savara.wsdl.util.WSDLGeneratorUtil;
import org.scribble.protocol.model.*;
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionPatterns.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionPatterns.java 2011-01-07 17:17:42 UTC (rev 547)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionPatterns.java 2011-01-07 19:11:25 UTC (rev 548)
@@ -18,7 +18,7 @@
package org.savara.bpel.model.change;
import org.savara.bpel.util.BPELInteractionUtil;
-import org.savara.model.util.InteractionUtil;
+import org.savara.common.model.util.InteractionUtil;
import org.scribble.protocol.model.*;
/**
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ModelChangeUtils.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ModelChangeUtils.java 2011-01-07 17:17:42 UTC (rev 547)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ModelChangeUtils.java 2011-01-07 19:11:25 UTC (rev 548)
@@ -17,8 +17,8 @@
*/
package org.savara.bpel.model.change;
+import org.savara.common.model.change.ModelChangeContext;
import org.savara.contract.model.Contract;
-import org.savara.model.change.ModelChangeContext;
import org.scribble.protocol.model.*;
/**
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ProtocolModelChangeRule.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ProtocolModelChangeRule.java 2011-01-07 17:17:42 UTC (rev 547)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ProtocolModelChangeRule.java 2011-01-07 19:11:25 UTC (rev 548)
@@ -23,9 +23,9 @@
import org.savara.bpel.model.TScope;
import org.savara.bpel.model.TSequence;
import org.savara.bpel.util.ImportUtil;
+import org.savara.common.model.change.ModelChangeContext;
import org.savara.contract.model.Contract;
import org.savara.contract.model.Interface;
-import org.savara.model.change.ModelChangeContext;
import org.scribble.protocol.model.*;
/**
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ProtocolModelModelChangeRule.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ProtocolModelModelChangeRule.java 2011-01-07 17:17:42 UTC (rev 547)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ProtocolModelModelChangeRule.java 2011-01-07 19:11:25 UTC (rev 548)
@@ -17,7 +17,7 @@
*/
package org.savara.bpel.model.change;
-import org.savara.model.change.ModelChangeContext;
+import org.savara.common.model.change.ModelChangeContext;
import org.scribble.protocol.model.*;
/**
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/RepeatModelChangeRule.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/RepeatModelChangeRule.java 2011-01-07 17:17:42 UTC (rev 547)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/RepeatModelChangeRule.java 2011-01-07 19:11:25 UTC (rev 548)
@@ -19,7 +19,7 @@
import org.savara.bpel.model.TSequence;
import org.savara.bpel.model.TWhile;
-import org.savara.model.change.ModelChangeContext;
+import org.savara.common.model.change.ModelChangeContext;
import org.scribble.protocol.model.*;
/**
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/RunModelChangeRule.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/RunModelChangeRule.java 2011-01-07 17:17:42 UTC (rev 547)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/RunModelChangeRule.java 2011-01-07 19:11:25 UTC (rev 548)
@@ -20,7 +20,7 @@
import org.savara.bpel.BPELDefinitions;
import org.savara.bpel.model.TScope;
import org.savara.bpel.model.TSequence;
-import org.savara.model.change.ModelChangeContext;
+import org.savara.common.model.change.ModelChangeContext;
import org.scribble.protocol.model.*;
/**
13 years, 5 months
savara SVN: r546 - branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-07 12:14:20 -0500 (Fri, 07 Jan 2011)
New Revision: 546
Removed:
branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/.classpath
branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/.project
branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/Copyright.txt
branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/META-INF/
branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/build.properties
branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/pom.xml
branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/src/
Log:
Moved org.savara.protoco.contract (plugin) code into org.savara.contract bundle.
Deleted: branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/.classpath
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/.classpath 2011-01-07 16:53:40 UTC (rev 545)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/.classpath 2011-01-07 17:14:20 UTC (rev 546)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/java"/>
- <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="output" path="bin"/>
-</classpath>
Deleted: branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/.project
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/.project 2011-01-07 16:53:40 UTC (rev 545)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/.project 2011-01-07 17:14:20 UTC (rev 546)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.savara.protocol.contract</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
Deleted: branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/Copyright.txt
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/Copyright.txt 2011-01-07 16:53:40 UTC (rev 545)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/Copyright.txt 2011-01-07 17:14:20 UTC (rev 546)
@@ -1,17 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
Deleted: branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/build.properties
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/build.properties 2011-01-07 16:53:40 UTC (rev 545)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/build.properties 2011-01-07 17:14:20 UTC (rev 546)
@@ -1,4 +0,0 @@
-source.. = src/java/
-output.. = bin/
-bin.includes = META-INF/,\
- .
Deleted: branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/pom.xml 2011-01-07 16:53:40 UTC (rev 545)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/pom.xml 2011-01-07 17:14:20 UTC (rev 546)
@@ -1,33 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- 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.savara.tools</groupId>
- <artifactId>org.savara.protocol.contract</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
- <name>Savara::Tools::Plugins::ProtocolContract</name>
-
- <parent>
- <groupId>org.savara.tools</groupId>
- <artifactId>plugins</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.common</artifactId>
- <version>${scribble.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.protocol</artifactId>
- <version>${scribble.version}</version>
- </dependency>
- <dependency>
- <groupId>org.savara.bundles</groupId>
- <artifactId>org.savara.contract</artifactId>
- <version>${savara.version}</version>
- </dependency>
- </dependencies>
- </project>
13 years, 5 months
savara SVN: r545 - in branches/experimental/2.0.x/bundles/org.savara.contract: META-INF and 5 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-07 11:53:40 -0500 (Fri, 07 Jan 2011)
New Revision: 545
Added:
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/ContractGenerator.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/ContractGeneratorFactory.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/Messages.properties
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractGeneratorImpl.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/osgi/
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/osgi/Activator.java
Removed:
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/osgi/
Modified:
branches/experimental/2.0.x/bundles/org.savara.contract/.classpath
branches/experimental/2.0.x/bundles/org.savara.contract/.project
branches/experimental/2.0.x/bundles/org.savara.contract/META-INF/MANIFEST.MF
branches/experimental/2.0.x/bundles/org.savara.contract/pom.xml
Log:
Moved org.savara.protoco.contract (plugin) code into org.savara.contract bundle.
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/.classpath
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/.classpath 2011-01-07 16:36:08 UTC (rev 544)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/.classpath 2011-01-07 16:53:40 UTC (rev 545)
@@ -6,4 +6,5 @@
<classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" path="/org.savara.core"/>
</classpath>
\ No newline at end of file
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/.project
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/.project 2011-01-07 16:36:08 UTC (rev 544)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/.project 2011-01-07 16:53:40 UTC (rev 545)
@@ -1,5 +1,5 @@
<projectDescription>
- <name>org.savara.contract.model</name>
+ <name>org.savara.contract</name>
<comment>The SAVARA project. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects/>
<buildSpec>
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/META-INF/MANIFEST.MF 2011-01-07 16:36:08 UTC (rev 544)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/META-INF/MANIFEST.MF 2011-01-07 16:53:40 UTC (rev 545)
@@ -1,11 +1,12 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: SAVARA Contract Model
-Bundle-SymbolicName: org.savara.contract.model
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.savara.contract.model.osgi.Activator
+Bundle-Name: SAVARA Contract
+Bundle-SymbolicName: org.savara.contract
+Bundle-Version: 2.0.0.SNAPSHOT
+Bundle-Activator: org.savara.contract.osgi.Activator
Bundle-Vendor: www.savara.org
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework
-Require-Bundle: org.scribble.common
+Require-Bundle: org.scribble.common,
+ org.savara.core
Export-Package: org.savara.contract.model
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/pom.xml 2011-01-07 16:36:08 UTC (rev 544)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/pom.xml 2011-01-07 16:53:40 UTC (rev 545)
@@ -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.savara.bundles</groupId>
- <artifactId>org.savara.contract.model</artifactId>
+ <artifactId>org.savara.contract</artifactId>
<version>2.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Savara::Bundles::ContractModel</name>
+ <name>Savara::Bundles::Contract</name>
<parent>
<groupId>org.savara</groupId>
Added: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/ContractGenerator.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/ContractGenerator.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/ContractGenerator.java 2011-01-07 16:53:40 UTC (rev 545)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.savara.contract.generator;
+
+import org.savara.contract.model.Contract;
+import org.scribble.protocol.model.Protocol;
+
+/**
+ * This interface represents the capability that generates a contract
+ * from a protocol associated with a particular interacting role.
+ *
+ */
+public interface ContractGenerator {
+
+ /**
+ * This method generates a contract associated with a supplied located
+ * protocol.
+ *
+ * @param cm The protocol
+ * @return The contract
+ */
+ public Contract generate(Protocol cm) throws IllegalArgumentException;
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/ContractGeneratorFactory.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/ContractGeneratorFactory.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/ContractGeneratorFactory.java 2011-01-07 16:53:40 UTC (rev 545)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.savara.contract.generator;
+
+import org.savara.contract.generator.impl.ContractGeneratorImpl;
+
+/**
+ * This class provides access to a contract generator.
+ *
+ */
+public class ContractGeneratorFactory {
+
+ /**
+ * This method returns an instance of the ContractGenerator
+ * interface.
+ *
+ * @return The contract generator
+ */
+ public static ContractGenerator getContractGenerator() {
+ return(new ContractGeneratorImpl());
+ }
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/Messages.properties
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/Messages.properties (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/Messages.properties 2011-01-07 16:53:40 UTC (rev 545)
@@ -0,0 +1,20 @@
+#/*
+# * JBoss, Home of Professional Open Source
+# * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+# * by the @authors tag. All rights reserved.
+# * See the copyright.txt in the distribution for a
+# * full listing of individual contributors.
+# * This copyrighted material is made available to anyone wishing to use,
+# * modify, copy, or redistribute it subject to the terms and conditions
+# * of the GNU Lesser General Public License, v. 2.1.
+# * This program is distributed in the hope that it will be useful, but WITHOUT A
+# * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+# * You should have received a copy of the GNU Lesser General Public License,
+# * v.2.1 along with this distribution; if not, write to the Free Software
+# * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# * MA 02110-1301, USA.
+# */
+
+SAVARAPC-00001=Protocol must be supplied
+SAVARAPC-00002=Contract generation requires a protocol that represents the local behaviour associated with a particular role
Added: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractGeneratorImpl.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractGeneratorImpl.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractGeneratorImpl.java 2011-01-07 16:53:40 UTC (rev 545)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.savara.contract.generator.impl;
+
+import java.text.MessageFormat;
+
+import org.savara.contract.model.Contract;
+import org.savara.contract.generator.ContractGenerator;
+import org.scribble.protocol.model.Protocol;
+
+/**
+ * This class generates a contract from a protocol defining the behaviour of
+ * multiple interacting roles.
+ *
+ */
+public class ContractGeneratorImpl implements ContractGenerator {
+
+ /**
+ * This method generates a contract associated with a supplied located
+ * protocol.
+ *
+ * @param cm The protocol
+ * @return The contract
+ */
+ public Contract generate(Protocol cm) throws IllegalArgumentException {
+
+ // Check parameters
+ if (cm == null) {
+ throw new IllegalArgumentException(MessageFormat.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.savara.protocol.contract.Messages").
+ getString("SAVARAPC-00001"), (Object)null));
+
+ } else if (cm.getRole() == null) {
+ throw new IllegalArgumentException(MessageFormat.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.savara.protocol.contract.Messages").
+ getString("SAVARAPC-00002"), (Object)null));
+ }
+
+ ContractIntrospector introspector=new ContractIntrospector(cm);
+
+ introspector.process();
+
+ return(introspector.getContract());
+ }
+
+}
Added: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java 2011-01-07 16:53:40 UTC (rev 545)
@@ -0,0 +1,250 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.savara.contract.generator.impl;
+
+import java.text.MessageFormat;
+import java.util.logging.Logger;
+
+import org.savara.contract.model.Contract;
+import org.savara.contract.model.Interface;
+import org.savara.contract.model.MessageExchangePattern;
+import org.savara.contract.model.OneWayRequestMEP;
+import org.savara.contract.model.RequestResponseMEP;
+import org.savara.contract.model.Type;
+import org.savara.contract.model.TypeDefinition;
+import org.savara.model.util.InteractionUtil;
+import org.scribble.protocol.model.AbstractModelObjectVisitor;
+import org.scribble.protocol.model.Protocol;
+import org.scribble.protocol.model.Interaction;
+import org.scribble.protocol.model.Run;
+import org.scribble.protocol.model.ModelObject;
+import org.scribble.protocol.model.Role;
+import org.scribble.protocol.model.TypeReference;
+
+/**
+ * This class examines a protocol to determine the contract that represents
+ * the static functional interface to the role's behaviour.
+ *
+ */
+public class ContractIntrospector extends AbstractModelObjectVisitor {
+
+ private Contract m_contract=new Contract();
+ private java.util.Set<Protocol> m_processedProtocols=null;
+ private Role m_role=null;
+ private Protocol m_protocol=null;
+
+ private static Logger logger = Logger.getLogger(ContractIntrospector.class.getName());
+
+ /**
+ * Constructor for the contract introspector.
+ *
+ * @param protocol The protocol to introspect
+ */
+ public ContractIntrospector(Protocol protocol) {
+ this(protocol, null, null);
+ }
+
+ /**
+ * Constructor for the contract introspector.
+ *
+ * @param protocol The protocol being introspected
+ * @param contract The optional contract being derived
+ * @param processed The optional set of protocols currently processed
+ */
+ public ContractIntrospector(Protocol protocol, Contract contract,
+ java.util.Set<Protocol> processed) {
+ m_contract = contract;
+
+ if (m_contract == null) {
+ m_contract = new Contract();
+ }
+
+ if (processed != null) {
+ m_processedProtocols = processed;
+ } else {
+ m_processedProtocols = new java.util.HashSet<Protocol>();
+ }
+
+ m_protocol = protocol;
+
+ if (protocol != null) {
+ m_role = protocol.getRole();
+ }
+ }
+
+ /**
+ * This method returns the contract being derived.
+ *
+ * @return The contract
+ */
+ public Contract getContract() {
+ return(m_contract);
+ }
+
+ /**
+ * This method returns the interface.
+ *
+ * @return The interface
+ */
+ public Interface getInterface() {
+ Interface ret=getContract().getInterface(m_role.getName());
+
+ if (ret == null) {
+ // Create interface for the role
+ ret = new Interface();
+ ret.setName(m_role.getName());
+
+ getContract().getInterfaces().add(ret);
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the set of processed protocols.
+ *
+ * @return The processed protocols
+ */
+ public java.util.Set<Protocol> getProcessedProtocols() {
+ return(m_processedProtocols);
+ }
+
+ /**
+ * This method introspects the supplied protocol to derive information
+ * that can be used to define the functional contract for the role
+ * associated with the protocol.
+ *
+ * @param conv The located protocol
+ */
+ public void process() throws IllegalStateException {
+
+ if (m_protocol == null) {
+ throw new IllegalStateException(MessageFormat.format(
+ java.util.PropertyResourceBundle.getBundle(
+ "org.savara.protocol.contract.Messages").
+ getString("SAVARAPC-00001"), (Object)null));
+ }
+
+ m_protocol.visit(this);
+ }
+
+ public boolean process(ModelObject obj) {
+ boolean f_visitChildren=true;
+
+ if (obj.getClass() == Protocol.class) {
+
+ // Only visit children if same protocol that is being visited
+ f_visitChildren = (obj == m_protocol);
+
+ } else if (obj.getClass() == Run.class) {
+ Run run=(Run)obj;
+
+ Protocol toProtocol=run.getProtocol();
+
+ // Check if protocol already processed to avoid stack overflow
+ if (m_processedProtocols.contains(toProtocol) == false) {
+ m_processedProtocols.add(toProtocol);
+
+ ContractIntrospector ci=new ContractIntrospector(toProtocol,
+ getContract(), getProcessedProtocols());
+
+ ci.process();
+ } else {
+ logger.fine("Invoked definition not found for "+run.getProtocolReference());
+ }
+ } else if (obj.getClass() == Interaction.class) {
+ accept((Interaction)obj);
+ }
+
+ return(f_visitChildren);
+ }
+
+ /**
+ * This method introspects the supplied interaction to generate Message Exchange
+ * Patterns on the contract interface.
+ *
+ * @param interaction The interaction
+ */
+ public void accept(Interaction interaction) {
+
+ // Check if the interacton is being received
+ if (interaction.getFromRole() != null &&
+ interaction.getFromRole().equals(m_role) == false) {
+
+ // Received by the role, but need to check if its replyTo
+ // has been set, indicating it is receiving a response
+ if (InteractionUtil.getReplyToLabel(interaction) == null ||
+ InteractionUtil.getReplyToLabel(interaction).trim().length() == 0) {
+
+ // Receiving a request - so record this in the contract
+ Interface intf=getInterface();
+
+ if (interaction.getMessageSignature().getOperation() != null) {
+
+ // Check if message exchange pattern exists for operation
+ MessageExchangePattern mep=intf.getMessageExchangePatternForOperation(
+ interaction.getMessageSignature().getOperation());
+
+ if (mep == null) {
+ // Create new MEP
+ if (InteractionUtil.getRequestLabel(interaction) != null) {
+ mep = new RequestResponseMEP();
+ } else {
+ mep = new OneWayRequestMEP();
+ }
+
+ mep.setOperation(interaction.getMessageSignature().getOperation());
+
+ for (int i=0; i < interaction.getMessageSignature().getTypeReferences().size(); i++) {
+ mep.getTypes().add(convertType(interaction.getMessageSignature().getTypeReferences().get(i)));
+ }
+
+ intf.getMessageExchangePatterns().add(mep);
+ }
+ }
+
+ } else {
+
+ }
+ }
+ }
+
+ /**
+ * This method converts a protocol type reference into a contract model type.
+ *
+ * @param tref The protocol type reference
+ * @return The type
+ */
+ public Type convertType(TypeReference tref) {
+ Type ret=new Type();
+
+ TypeDefinition td=new TypeDefinition();
+ td.setName(tref.getLocalpart());
+ td.setNamespace(tref.getNamespace());
+ //td.setTypeSystem(typeSystem);
+
+ ret.getTypeDefinitions().add(td);
+ ret.setName(td.getName());
+
+ return(ret);
+ }
+}
Added: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/osgi/Activator.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/osgi/Activator.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/osgi/Activator.java 2011-01-07 16:53:40 UTC (rev 545)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.savara.contract.osgi;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ }
+
+}
13 years, 5 months