[savara-commits] savara SVN: r563 - in branches/experimental/2.0.x: bundles/org.savara.contract and 23 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Sat Jan 8 18:39:19 EST 2011
Author: objectiser
Date: 2011-01-08 18:39:18 -0500 (Sat, 08 Jan 2011)
New Revision: 563
Added:
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/resources/
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/resources/org/
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/resources/org/savara/
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/resources/org/savara/contract/
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/resources/org/savara/contract/Messages.properties
branches/experimental/2.0.x/bundles/org.savara.contract/src/test/
branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/
branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/
branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/
branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/
branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/
branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/ContractGeneratorTest.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/impl/
branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/impl/ContractIntrospectorTest.java
Modified:
branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/InteractionUtil.java
branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/PropertyName.java
branches/experimental/2.0.x/bundles/org.savara.contract/.classpath
branches/experimental/2.0.x/bundles/org.savara.contract/META-INF/MANIFEST.MF
branches/experimental/2.0.x/bundles/org.savara.contract/pom.xml
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractGeneratorImpl.java
branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/
branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml
branches/experimental/2.0.x/tools/features/org.savara.tools.feature/
branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml
branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml
branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/
branches/experimental/2.0.x/tools/plugins/org.savara.tools.validator/
branches/experimental/2.0.x/tools/plugins/pom.xml
branches/experimental/2.0.x/tools/pom.xml
branches/experimental/2.0.x/tools/site/
branches/experimental/2.0.x/tools/site/pom.xml
branches/experimental/2.0.x/tools/tests/pom.xml
Log:
Fix tools building with maven.
Modified: branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/InteractionUtil.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/InteractionUtil.java 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/InteractionUtil.java 2011-01-08 23:39:18 UTC (rev 563)
@@ -127,19 +127,19 @@
}
public static String getRequestLabel(Interaction interaction) {
- return((String)interaction.getProperties().get("RequestLabel"));
+ return((String)interaction.getProperties().get(PropertyName.REQUEST_LABEL));
}
public static String getReplyToLabel(Interaction interaction) {
- return((String)interaction.getProperties().get("ReplyToLabel"));
+ return((String)interaction.getProperties().get(PropertyName.REPLY_TO_LABEL));
}
public static String getRequestLabel(When interaction) {
- return((String)interaction.getProperties().get("RequestLabel"));
+ return((String)interaction.getProperties().get(PropertyName.REQUEST_LABEL));
}
public static String getReplyToLabel(When interaction) {
- return((String)interaction.getProperties().get("ReplyToLabel"));
+ return((String)interaction.getProperties().get(PropertyName.REPLY_TO_LABEL));
}
/**
Modified: branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/PropertyName.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/PropertyName.java 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/PropertyName.java 2011-01-08 23:39:18 UTC (rev 563)
@@ -28,6 +28,9 @@
public static final String INTERFACE_NAME = "InterfaceName";
public static final String FAULT_NAME = "FaultName";
+
+ public static final String REQUEST_LABEL = "RequestLabel";
+ public static final String REPLY_TO_LABEL = "ReplyToLabel";
// TODO: Determine if required (SAVARA-158)
public static final String TYPE_SYSTEM = "TypeSystem";
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/.classpath
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/.classpath 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/.classpath 2011-01-08 23:39:18 UTC (rev 563)
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
+ <classpathentry including="**/*.java" 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/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="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 combineaccessrules="false" kind="src" path="/org.savara.common"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
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-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/META-INF/MANIFEST.MF 2011-01-08 23:39:18 UTC (rev 563)
@@ -6,7 +6,8 @@
Bundle-Activator: org.savara.contract.osgi.Activator
Bundle-Vendor: www.savara.org
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.osgi.framework
+Import-Package: org.junit,
+ org.osgi.framework
Require-Bundle: org.scribble.common,
org.savara.common
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-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/pom.xml 2011-01-08 23:39:18 UTC (rev 563)
@@ -34,5 +34,11 @@
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: 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 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractGeneratorImpl.java 2011-01-08 23:39:18 UTC (rev 563)
@@ -43,13 +43,13 @@
if (cm == null) {
throw new IllegalArgumentException(MessageFormat.format(
java.util.PropertyResourceBundle.getBundle(
- "org.savara.protocol.contract.Messages").
+ "org.savara.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").
+ "org.savara.contract.Messages").
getString("SAVARAPC-00002"), (Object)null));
}
Added: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/resources/org/savara/contract/Messages.properties
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/resources/org/savara/contract/Messages.properties (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/resources/org/savara/contract/Messages.properties 2011-01-08 23:39:18 UTC (rev 563)
@@ -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/test/java/org/savara/contract/generator/ContractGeneratorTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/ContractGeneratorTest.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/ContractGeneratorTest.java 2011-01-08 23:39:18 UTC (rev 563)
@@ -0,0 +1,63 @@
+package org.savara.contract.generator;
+
+import static org.junit.Assert.*;
+
+import org.savara.contract.generator.ContractGenerator;
+import org.savara.contract.generator.ContractGeneratorFactory;
+import org.scribble.protocol.model.Protocol;
+import org.scribble.protocol.model.Role;
+
+public class ContractGeneratorTest {
+
+ @org.junit.Test
+ public void testGenerateProtocolNull() {
+
+ ContractGenerator generator=ContractGeneratorFactory.getContractGenerator();
+
+ try {
+ Protocol conv=null;
+
+ generator.generate(conv);
+
+ fail("Should have thrown IllegalArgumentException");
+
+ } catch(IllegalArgumentException iae) {
+ // Test worked
+ }
+ }
+
+ @org.junit.Test
+ public void testGenerateProtocolNotLocated() {
+
+ ContractGenerator generator=ContractGeneratorFactory.getContractGenerator();
+
+ try {
+ Protocol conv=new Protocol();
+ conv.setName("NonLocatedProtocol");
+
+ generator.generate(conv);
+
+ fail("Should have thrown IllegalArgumentException");
+
+ } catch(IllegalArgumentException iae) {
+ // Test worked
+ }
+ }
+
+ @org.junit.Test
+ public void testGenerateConversationAndRoleNotNull2() {
+
+ ContractGenerator generator=ContractGeneratorFactory.getContractGenerator();
+
+ try {
+ Protocol conv=new Protocol();
+ conv.setRole(new Role());
+ conv.setName("LocatedProtocol");
+
+ generator.generate(conv);
+
+ } catch(IllegalArgumentException iae) {
+ fail("Should NOT have thrown IllegalArgumentException");
+ }
+ }
+}
Added: branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/impl/ContractIntrospectorTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/impl/ContractIntrospectorTest.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/impl/ContractIntrospectorTest.java 2011-01-08 23:39:18 UTC (rev 563)
@@ -0,0 +1,286 @@
+/*
+ * 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 org.savara.common.model.util.PropertyName;
+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.generator.impl.ContractIntrospector;
+import org.scribble.protocol.model.Protocol;
+import org.scribble.protocol.model.Interaction;
+import org.scribble.protocol.model.ProtocolReference;
+import org.scribble.protocol.model.Run;
+import org.scribble.protocol.model.MessageSignature;
+import org.scribble.protocol.model.Role;
+import org.scribble.protocol.model.TypeReference;
+import org.scribble.protocol.util.InteractionUtil;
+
+import static org.junit.Assert.*;
+
+public class ContractIntrospectorTest {
+
+ private static final String MY_ROLE = "myRole";
+ private static final String TYPE_NS = "typeNS";
+ private static final String TYPE_LP = "typeLP";
+ private static final String OP_NAME = "opName";
+
+ @org.junit.Test
+ public void testNoSubProtocolWithoutRun() {
+ Role r=new Role();
+ r.setName("role");
+
+ Protocol top=new Protocol();
+ top.setName("top");
+ top.setRole(r);
+
+ Protocol mid=new Protocol();
+ mid.setName("mid");
+ mid.setRole(r);
+
+ Protocol sub=new Protocol();
+ sub.setName("sub");
+ sub.setRole(r);
+
+ ProtocolReference ref=new ProtocolReference();
+ ref.setName("sub");
+ ref.setRole(r);
+
+ Run run=new Run();
+ run.setProtocolReference(ref);
+
+ top.getBlock().getContents().add(mid);
+
+ mid.getBlock().getContents().add(run);
+ mid.getBlock().getContents().add(sub);
+
+ ContractIntrospector introspector=new ContractIntrospector(top);
+
+ introspector.process();
+
+ if (introspector.getProcessedProtocols().size() != 0) {
+ fail("Expecting 0 processed protocol, but got: "+introspector.getProcessedProtocols().size());
+ }
+ }
+
+ @org.junit.Test
+ public void testSubProtocolWithRun() {
+ Role r=new Role();
+ r.setName("role");
+
+ Protocol top=new Protocol();
+ top.setName("top");
+ top.setRole(r);
+
+ Protocol mid=new Protocol();
+ mid.setName("mid");
+ mid.setRole(r);
+
+ Protocol sub=new Protocol();
+ sub.setName("sub");
+ sub.setRole(r);
+
+ ProtocolReference ref1=new ProtocolReference();
+ ref1.setName("mid");
+ ref1.setRole(r);
+ ref1.setInner(true);
+
+ Run run1=new Run();
+ run1.setProtocolReference(ref1);
+
+ top.getBlock().getContents().add(run1);
+ top.getBlock().getContents().add(mid);
+
+ ProtocolReference ref2=new ProtocolReference();
+ ref2.setName("sub");
+ ref2.setRole(r);
+ ref2.setInner(true);
+
+ Run run2=new Run();
+ run2.setProtocolReference(ref2);
+
+ mid.getBlock().getContents().add(run2);
+ mid.getBlock().getContents().add(sub);
+
+ ContractIntrospector introspector=new ContractIntrospector(top);
+
+ introspector.process();
+
+ if (introspector.getProcessedProtocols().size() != 2) {
+ fail("Expecting 2 processed protocol, but got: "+introspector.getProcessedProtocols().size());
+ }
+
+ if (introspector.getProcessedProtocols().contains(mid) == false) {
+ fail("Should contain mid");
+ }
+
+ if (introspector.getProcessedProtocols().contains(sub) == false) {
+ fail("Should contain sub");
+ }
+ }
+
+ @org.junit.Test
+ public void testCreateSingleInterface() {
+ Protocol protocol=new Protocol();
+ Role role=new Role();
+ role.setName(MY_ROLE);
+ protocol.setRole(role);
+
+ ContractIntrospector introspector=new ContractIntrospector(protocol);
+
+ if (introspector.getContract().getInterfaces().size() != 0) {
+ fail("Should be 0 interfaces: "+introspector.getContract().getInterfaces().size());
+ }
+
+ Interface intf=introspector.getInterface();
+
+ if (intf == null) {
+ fail("Interface not created");
+ }
+
+ if (introspector.getContract().getInterfaces().size() != 1) {
+ fail("Should be 1 interface: "+introspector.getContract().getInterfaces().size());
+ }
+
+ Interface intf2=introspector.getInterface();
+
+ if (intf2 != intf) {
+ fail("Interfaces are different");
+ }
+
+ if (introspector.getContract().getInterfaces().size() != 1) {
+ fail("Should still only be 1 interface: "+introspector.getContract().getInterfaces().size());
+ }
+ }
+
+ @org.junit.Test
+ public void testVisitInteractionOneWayRequestRPC() {
+ Protocol protocol=new Protocol();
+ Role role=new Role();
+ role.setName(MY_ROLE);
+ protocol.setRole(role);
+
+ ContractIntrospector introspector=new ContractIntrospector(protocol);
+
+ Interaction interaction=new Interaction();
+
+ MessageSignature msig=new MessageSignature();
+ msig.setOperation(OP_NAME);
+
+ TypeReference tref=new TypeReference();
+ tref.setName(TYPE_LP);
+ //tref.setNamespace(TYPE_NS);
+ msig.getTypeReferences().add(tref);
+
+ interaction.setMessageSignature(msig);
+ interaction.setFromRole(new Role());
+
+ introspector.accept(interaction);
+
+ Contract contract=introspector.getContract();
+
+ Interface intf=contract.getInterface(role.getName());
+
+ if (intf == null) {
+ fail("Interface '"+role.getName()+"' not found");
+ }
+
+ MessageExchangePattern mep=intf.getMessageExchangePatternForOperation(OP_NAME);
+
+ if (mep == null) {
+ fail("Operation '"+OP_NAME+"' not found");
+ }
+
+ if ((mep instanceof OneWayRequestMEP) == false) {
+ fail("Not a oneway request");
+ }
+
+ if (mep.getTypes().size() != 1) {
+ fail("One type expected, but got: "+mep.getTypes().size());
+ }
+
+ Type t=mep.getTypes().get(0);
+
+ if (t.getName().equals(TYPE_LP) == false) {
+ fail("Type name not correct: "+t.getName());
+ }
+ }
+
+
+ @org.junit.Test
+ public void testVisitInteractionRequestResponseRPCOnlyRequest() {
+ Protocol protocol=new Protocol();
+ Role role=new Role();
+ role.setName(MY_ROLE);
+ protocol.setRole(role);
+
+ ContractIntrospector introspector=new ContractIntrospector(protocol);
+
+ Interaction interaction=new Interaction();
+
+ MessageSignature msig=new MessageSignature();
+ msig.setOperation(OP_NAME);
+
+ TypeReference tref=new TypeReference();
+ tref.setName(TYPE_LP);
+ //tref.setNamespace(TYPE_NS);
+ msig.getTypeReferences().add(tref);
+
+ interaction.setMessageSignature(msig);
+ interaction.setFromRole(new Role());
+
+ interaction.getProperties().put(PropertyName.REQUEST_LABEL, "label");
+
+ introspector.accept(interaction);
+
+ Contract contract=introspector.getContract();
+
+ Interface intf=contract.getInterface(role.getName());
+
+ if (intf == null) {
+ fail("Interface '"+role.getName()+"' not found");
+ }
+
+ MessageExchangePattern mep=intf.getMessageExchangePatternForOperation(OP_NAME);
+
+ if (mep == null) {
+ fail("Operation '"+OP_NAME+"' not found");
+ }
+
+ if ((mep instanceof RequestResponseMEP) == false) {
+ fail("Not a request/response MEP");
+ }
+
+ if (mep.getTypes().size() != 1) {
+ fail("One type expected, but got: "+mep.getTypes().size());
+ }
+
+ Type t=mep.getTypes().get(0);
+
+ if (t.getName().equals(TYPE_LP) == false) {
+ fail("Type name not correct: "+t.getName());
+ }
+ }
+}
Property changes on: branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature
___________________________________________________________________
Name: svn:ignore
+ target
Modified: branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml 2011-01-08 23:39:18 UTC (rev 563)
@@ -35,6 +35,11 @@
<version>${savara.version}</version>
</dependency>
<dependency>
+ <groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.pi4soa.cdm</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.scribble.bundles</groupId>
<artifactId>org.scribble.protocol</artifactId>
<version>${scribble.version}</version>
Property changes on: branches/experimental/2.0.x/tools/features/org.savara.tools.feature
___________________________________________________________________
Name: svn:ignore
+ target
Modified: branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml 2011-01-08 23:39:18 UTC (rev 563)
@@ -187,13 +187,6 @@
unpack="false"/>
<plugin
- id="org.savara.protocol.contract"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.savara.common"
download-size="0"
install-size="0"
@@ -256,6 +249,7 @@
version="0.0.0"
unpack="false"/>
+<!--
<plugin
id="org.savara.tap.eclipse"
download-size="0"
@@ -276,5 +270,6 @@
install-size="0"
version="0.0.0"
unpack="false"/>
+-->
</feature>
Modified: branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml 2011-01-08 23:39:18 UTC (rev 563)
@@ -54,11 +54,6 @@
<artifactId>org.savara.tools.wsdl</artifactId>
<version>${savara.version}</version>
</dependency>
- <dependency>
- <groupId>org.savara.tools</groupId>
- <artifactId>org.savara.protocol.contract</artifactId>
- <version>${savara.version}</version>
- </dependency>
</dependencies>
</project>
Property changes on: branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor
___________________________________________________________________
Name: svn:ignore
- classes
+ classes
target
Property changes on: branches/experimental/2.0.x/tools/plugins/org.savara.tools.validator
___________________________________________________________________
Name: svn:ignore
- bin
+ bin
target
Modified: branches/experimental/2.0.x/tools/plugins/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/plugins/pom.xml 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/tools/plugins/pom.xml 2011-01-08 23:39:18 UTC (rev 563)
@@ -16,7 +16,6 @@
<modules>
<!--
- <module>org.savara.protocol.contract</module>
<module>org.savara.tap.eclipse</module>
<module>org.savara.tap.model</module>
<module>org.savara.tap.validation</module>
Modified: branches/experimental/2.0.x/tools/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/pom.xml 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/tools/pom.xml 2011-01-08 23:39:18 UTC (rev 563)
@@ -114,7 +114,7 @@
</repository>
<repository>
<id>pi4soa</id>
- <url>http://download.jboss.org/jbosstools/builds/staging/pi4soa/all/repo/</url>
+ <url>http://download.jboss.org/jbosstools/builds/staging/jbosstools-pi4soa-3.1_trunk/all/repo/</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -124,6 +124,17 @@
</releases>
</repository>
<repository>
+ <id>scribble</id>
+ <url>http://download.jboss.org/jbosstools/builds/staging/scribble/all/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
<id>eclipse-helios</id>
<url>http://download.eclipse.org/releases/helios</url>
<layout>p2</layout>
Property changes on: branches/experimental/2.0.x/tools/site
___________________________________________________________________
Name: svn:ignore
+ target
Modified: branches/experimental/2.0.x/tools/site/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/site/pom.xml 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/tools/site/pom.xml 2011-01-08 23:39:18 UTC (rev 563)
@@ -34,6 +34,11 @@
<artifactId>org.savara.contract</artifactId>
<version>${savara.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.pi4soa.cdm</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
<dependency>
<groupId>org.scribble.bundles</groupId>
<artifactId>org.scribble.common</artifactId>
Modified: branches/experimental/2.0.x/tools/tests/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/tests/pom.xml 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/tools/tests/pom.xml 2011-01-08 23:39:18 UTC (rev 563)
@@ -15,7 +15,6 @@
</parent>
<modules>
- <module>org.savara.protocol.contract.tests</module>
</modules>
</project>
More information about the savara-commits
mailing list