Author: objectiser
Date: 2011-01-18 15:27:34 -0500 (Tue, 18 Jan 2011)
New Revision: 594
Added:
branches/experimental/2.0.x/bundles/org.savara.scenario/.settings/
branches/experimental/2.0.x/bundles/org.savara.scenario/.settings/org.eclipse.jdt.core.prefs
Modified:
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java
branches/experimental/2.0.x/bundles/org.savara.wsdl/.classpath
branches/experimental/2.0.x/bundles/org.savara.wsdl/.project
Log:
Modified:
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java 2011-01-18
20:26:53 UTC (rev 593)
+++
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java 2011-01-18
20:27:34 UTC (rev 594)
@@ -245,171 +245,143 @@
return(f_clearInteraction ? null : m_interaction);
}
- @Override
public void assign(Assign assign) {
// TODO Auto-generated method stub
}
- @Override
public void choiceStart(org.pi4soa.cdl.Choice choice) {
if (m_interaction == null && choice != m_parent) {
f_clearInteraction = true;
}
}
- @Override
public void choiceEnd(org.pi4soa.cdl.Choice choice) {
// TODO Auto-generated method stub
}
- @Override
public void choreographyStart(Choreography choreography) {
// TODO Auto-generated method stub
}
- @Override
public void choreographyEnd(Choreography choreography) {
// TODO Auto-generated method stub
}
- @Override
public void conditionalStart(Conditional conditional) {
if (m_interaction == null && conditional != m_parent) {
f_clearInteraction = true;
}
}
- @Override
public void conditionalEnd(Conditional conditional) {
// TODO Auto-generated method stub
}
- @Override
public void exceptionHandlerStart(ExceptionHandler handler) {
// TODO Auto-generated method stub
}
- @Override
public void exceptionHandlerEnd(ExceptionHandler handler) {
// TODO Auto-generated method stub
}
- @Override
public void exceptionWorkUnitStart(ExceptionWorkUnit workunit) {
// TODO Auto-generated method stub
}
- @Override
public void exceptionWorkUnitEnd(ExceptionWorkUnit workunit) {
// TODO Auto-generated method stub
}
- @Override
public void finalizerStart(FinalizerHandler finalizer) {
// TODO Auto-generated method stub
}
- @Override
public void finalizerEnd(FinalizerHandler finalizer) {
// TODO Auto-generated method stub
}
- @Override
public void finalize(Finalize finalize) {
// TODO Auto-generated method stub
}
- @Override
public void interaction(Interaction interaction) {
if (m_interaction == null) {
m_interaction = interaction;
}
}
- @Override
public void noAction(NoAction noAction) {
// TODO Auto-generated method stub
}
- @Override
public void packageStart(Package pack) {
// TODO Auto-generated method stub
}
- @Override
public void packageEnd(Package pack) {
// TODO Auto-generated method stub
}
- @Override
public void parallelStart(Parallel parallel) {
// TODO Auto-generated method stub
}
- @Override
public void parallelEnd(Parallel parallel) {
// TODO Auto-generated method stub
}
- @Override
public void perform(Perform perform) {
perform.getChoreography().visit(this);
}
- @Override
public void sequenceStart(Sequence sequence) {
// TODO Auto-generated method stub
}
- @Override
public void sequenceEnd(Sequence sequence) {
// TODO Auto-generated method stub
}
- @Override
public void silentAction(SilentAction silentAction) {
// TODO Auto-generated method stub
}
- @Override
public void whenStart(org.pi4soa.cdl.When when) {
// TODO Auto-generated method stub
}
- @Override
public void whenEnd(org.pi4soa.cdl.When when) {
// TODO Auto-generated method stub
}
- @Override
public void whileStart(While whileElem) {
// TODO Auto-generated method stub
}
- @Override
public void whileEnd(While whileElem) {
// TODO Auto-generated method stub
Added:
branches/experimental/2.0.x/bundles/org.savara.scenario/.settings/org.eclipse.jdt.core.prefs
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.scenario/.settings/org.eclipse.jdt.core.prefs
(rev 0)
+++
branches/experimental/2.0.x/bundles/org.savara.scenario/.settings/org.eclipse.jdt.core.prefs 2011-01-18
20:27:34 UTC (rev 594)
@@ -0,0 +1,5 @@
+#Tue Jan 18 20:19:43 GMT 2011
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/.classpath
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/.classpath 2011-01-18 20:26:53 UTC
(rev 593)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/.classpath 2011-01-18 20:27:34 UTC
(rev 594)
@@ -1,16 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry including="**/*.java" kind="src"
output="target/test-classes" path="src/test/java"/>
- <classpathentry including="**/*.java" kind="src"
path="src/main/java"/>
- <classpathentry kind="var"
path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
- <classpathentry kind="var"
path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/>
- <classpathentry kind="src" path="/org.savara.contract"/>
- <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="var"
path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/org.savara.common"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+ <classpathentry kind="src" path="src/test/java"
output="target/test-classes" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/java"
including="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="var"
path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/>
+ <classpathentry kind="src" path="/org.savara.common"/>
+ <classpathentry kind="src" path="/org.savara.contract"/>
+ <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="var"
path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+</classpath>
\ No newline at end of file
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/.project
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/.project 2011-01-18 20:26:53 UTC
(rev 593)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/.project 2011-01-18 20:27:34 UTC
(rev 594)
@@ -2,7 +2,8 @@
<name>org.savara.wsdl</name>
<comment>The SAVARA project. NO_M2ECLIPSE_SUPPORT: Project files created with the
maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects>
- <project>org.savara.contract.model</project>
+ <project>org.savara.common</project>
+ <project>org.savara.contract</project>
</projects>
<buildSpec>
<buildCommand>