[savara-commits] 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.

[do-not-reply at 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