geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r567092 - in /geronimo/sandbox/tuscany-integration: ./ geronimo-tuscany/ geronimo-tuscany/configs/src/main/resources/META-INF/ geronimo-tuscany/configs/src/plan/ geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/ miscellane...
Date Fri, 17 Aug 2007 17:34:48 GMT
Author: vamsic007
Date: Fri Aug 17 10:34:47 2007
New Revision: 567092

URL: http://svn.apache.org/viewvc?view=rev&rev=567092
Log:
  o Switched Geronimo version to 2.0.1.
  o Changed the code to account for interface change in EmbeddedSCADomain since 0.91-incubating.
  o TUSCANY-1477 and TUSCANY-1480 no longer see to affect us.  Got rid of startOtherComponents
attribute etc.
  o Additional-jars.zip is no longer required.  All dependencies could be downloaded from
remote maven repositories during plugin installataion.

Removed:
    geronimo/sandbox/tuscany-integration/miscellaneous/additional-jars.zip
    geronimo/sandbox/tuscany-integration/miscellaneous/geronimo-tuscany-1.0.jar
    geronimo/sandbox/tuscany-integration/miscellaneous/plan.xml
Modified:
    geronimo/sandbox/tuscany-integration/README.TXT
    geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/plan/plan.xml
    geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java
    geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java
    geronimo/sandbox/tuscany-integration/geronimo-tuscany/pom.xml
    geronimo/sandbox/tuscany-integration/miscellaneous/tuscany-plugin-1.0.car
    geronimo/sandbox/tuscany-integration/samples/Calculator/calculator.jar
    geronimo/sandbox/tuscany-integration/samples/helloWorld-ws.jar

Modified: geronimo/sandbox/tuscany-integration/README.TXT
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/README.TXT?view=diff&rev=567092&r1=567091&r2=567092
==============================================================================
--- geronimo/sandbox/tuscany-integration/README.TXT (original)
+++ geronimo/sandbox/tuscany-integration/README.TXT Fri Aug 17 10:34:47 2007
@@ -2,11 +2,9 @@
 2. Change directory to <g_t_dir>\geronimo-tuscany
 3. Build using "mvn clean install"
 4. Install Geronimo 2.0 Tomat Distribution.  The installation directory will be referred
to as <g2.0_dir>.
-5. Unzip <g_t_dir>\miscellaneous\additional-jars.zip to <g2.0_dir>\repository
-6. Deploy the plugin using "deploy.bat install-plugin <g_t_dir>\geronimo-tuscany\configs\target\tuscany-plugin-1.0.car"
-7. Deploy <g_t_dir>\samples\helloWorld-ws.jar
-8. Access HelloWorldService at web service URL http://localhost:8080/hello/HelloWorldService
+5. Deploy the plugin using "deploy.bat install-plugin <g_t_dir>\geronimo-tuscany\configs\target\tuscany-plugin-1.0.car"
+6. Deploy <g_t_dir>\samples\helloWorld-ws.jar
+7. Access HelloWorldService at web service URL http://localhost:8080/hello/HelloWorldService
 
 Note: If you are unable to build the plugin from source, deploy the plugin available in <g_t_dir>/miscellaneous
dir.
-6.1.  Run "deploy.bat install-plugin <g_t_dir>\miscellaneous\tuscany-plugin-1.0.car"
-6.2.  Run "deploy.bat redeploy <g_t_dir>\miscellaneous\geronimo-tuscany-1.0.jar <g_t_dir>\miscellaneous\plan.xml
\ No newline at end of file
+      Run "deploy.bat install-plugin <g_t_dir>\miscellaneous\tuscany-plugin-1.0.car"

Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=567092&r1=567091&r2=567092
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/main/resources/META-INF/geronimo-plugin.xml
Fri Aug 17 10:34:47 2007
@@ -82,7 +82,7 @@
         <dependency>org.apache.tuscany.sca/tuscany-host-http/${tuscanyVersion}/jar</dependency>
     
         <dependency>org.apache.tuscany.sca/tuscany-host-geronimo/${tuscanyVersion}/jar</dependency>
     
         <dependency>org.apache.tuscany.sca/tuscany-implementation-java/${tuscanyVersion}/jar</dependency>
     
-        <dependency>org.apache.tuscany.sca/tuscany-implementation-java-runtime/${tuscanyVersion}/jar</dependency>
     
+        <!--dependency>org.apache.tuscany.sca/tuscany-implementation-java-runtime/${tuscanyVersion}/jar</dependency-->
     
         <dependency>org.apache.tuscany.sca/tuscany-implementation-java-xml/${tuscanyVersion}/jar</dependency>
     
         <dependency>org.apache.tuscany.sca/tuscany-interface/${tuscanyVersion}/jar</dependency>
     
         <dependency>org.apache.tuscany.sca/tuscany-interface-java/${tuscanyVersion}/jar</dependency>
     
@@ -92,7 +92,7 @@
         <dependency>org.apache.tuscany.sca/tuscany-binding-ws-axis2/${tuscanyVersion}/jar</dependency>
         <dependency>org.apache.tuscany.sca/tuscany-binding-ws-xml/${tuscanyVersion}/jar</dependency>
         <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl/${tuscanyVersion}/jar</dependency>
     
-        <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl-runtime/${tuscanyVersion}/jar</dependency>
     
+        <!--dependency>org.apache.tuscany.sca/tuscany-interface-wsdl-runtime/${tuscanyVersion}/jar</dependency-->
     
         <dependency>org.apache.tuscany.sca/tuscany-interface-wsdl-xml/${tuscanyVersion}/jar</dependency>
     
         <dependency>org.apache.tuscany.sca/tuscany-policy/${tuscanyVersion}/jar</dependency>
     
         <dependency>org.apache.tuscany.sca/tuscany-host-rmi/${tuscanyVersion}/jar</dependency>
         
@@ -102,6 +102,7 @@
         <!--dependency>org.apache.tuscany.sca/tuscany-binding-jsonrpc/${tuscanyVersion}/jar</dependency-->
         <dependency>org.apache.tuscany.sca/tuscany-binding-rmi/${tuscanyVersion}/jar</dependency>
         <dependency>org.apache.tuscany.sca/tuscany-binding-sca/${tuscanyVersion}</dependency>
+        <dependency>org.apache.tuscany.sca/tuscany-binding-sca-xml/${tuscanyVersion}</dependency>
         <dependency>org.apache.tuscany.sca/tuscany-distributed/${tuscanyVersion}</dependency>
         <dependency>org.apache.tuscany.sca/tuscany-extension-helper/${tuscanyVersion}/jar</dependency>
       
         <dependency>wsdl4j/wsdl4j/1.6.1/jar</dependency>      

Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/plan/plan.xml?view=diff&rev=567092&r1=567091&r2=567092
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/plan/plan.xml (original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/plan/plan.xml Fri Aug
17 10:34:47 2007
@@ -362,13 +362,13 @@
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
-            <dependency>
+            <!--dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-interface-java-runtime</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
-            </dependency>
+            </dependency-->
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-interface-java-xml</artifactId>
@@ -404,13 +404,13 @@
                 <type>jar</type>
                 <import>classes</import>
             </dependency>
-            <dependency>
+            <!--dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-interface-wsdl-runtime</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
                 <import>classes</import>
-            </dependency>
+            </dependency-->
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-interface-wsdl-xml</artifactId>
@@ -477,6 +477,13 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-binding-sca-xml</artifactId>
+                <version>${tuscanyVersion}</version>
+                <type>jar</type>
+                <import>classes</import>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-distributed</artifactId>
                 <version>${tuscanyVersion}</version>
                 <type>jar</type>
@@ -601,7 +608,6 @@
         <attribute name="serverInfoQuery">?name=ServerInfo</attribute>
         <attribute name="embeddedSCADomainQuery">?name=GeronimoSCADomain</attribute>
         <attribute name="useEmbeddedDomain">true</attribute>
-        <attribute name="startOtherComponents">true</attribute>
         <xml-attribute name="defaultEnvironment">
             <environment>
                 <dependencies>

Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java?view=diff&rev=567092&r1=567091&r2=567092
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java
(original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java
Fri Aug 17 10:34:47 2007
@@ -28,7 +28,6 @@
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.tuscany.sca.assembly.Component;
 import org.apache.tuscany.sca.assembly.Composite;
 import org.apache.tuscany.sca.contribution.Contribution;
 import org.apache.tuscany.sca.contribution.DeployedArtifact;
@@ -41,7 +40,6 @@
     private ClassLoader classLoader;
     private EmbeddedSCADomainGBean embeddedSCADomainRef;
     private boolean useEmbeddedDomain = true;
-    private boolean startOtherComponents = true; // TODO: Added as a hack. Eliminate this
when EmbeddedSCADomain is fixed.
     private Contribution contribution;
     private String contributionRoot;
     
@@ -74,52 +72,31 @@
                 
                 // Add contribution
                 contribution = eScaDomain.getContributionService().contribute(contributionRoot,
new URL(contributionRoot), modelResolver, false);
-                
-                // Add composites
-                for (DeployedArtifact artifact : contribution.getArtifacts()) {
+
+                // Collect the composites
+                List<Composite> composites = new ArrayList<Composite>();
+                for(DeployedArtifact artifact : contribution.getArtifacts()) {
                     if (artifact.getModel() instanceof Composite) {
-                        Composite composite = (Composite)artifact.getModel();
-                        eScaDomain.getDomainCompositeHelper().addComposite(composite);
+                        composites.add((Composite)artifact.getModel());
                     }
                 }
-                
-                // Activate domain
-                eScaDomain.getDomainCompositeHelper().activateDomain();
-                
-                // Start all the components
-                List<String> startedComponents = new ArrayList<String>();
-                for (DeployedArtifact artifact : contribution.getArtifacts()) {
-                    if (artifact.getModel() instanceof Composite) {
-                        Composite composite = (Composite)artifact.getModel();
-                        for(Component component: composite.getComponents()) {
-                            try {
-                                // FIXME: Eliminate calling start component on already started
component which results in Exception
-                                eScaDomain.getDomainCompositeHelper().startComponent(eScaDomain.getDomainCompositeHelper().getComponent(component.getName()));
-                            } catch(Throwable t) {
-                                // TODO: Anything else but ignore ??
-                                Throwable cause = t.getCause();
-                            }
-                            startedComponents.add(component.getName());
-                            embeddedSCADomainRef.getAllComponentNames().add(component.getName());
-                        }
-                    }
+
+                // Add the composites
+                for(Composite composite: composites) {
+                    eScaDomain.getDomainComposite().getIncludes().add(composite);
+                    eScaDomain.getCompositeBuilder().build(composite); 
                 }
                 
-                // Start other components
-                // TODO: Eliminate this when EmbeddedSCADomain is fixed.  This is added as
a hack as adding a new contribution is rendering the already existing services in the domain
unusable
-                if(startOtherComponents) {
-                    for(String componentName: embeddedSCADomainRef.getAllComponentNames())
{
-                        if(startedComponents.contains(componentName)) {
-                            continue;
-                        }
-                        try{
-                            eScaDomain.getDomainCompositeHelper().startComponent(eScaDomain.getDomainCompositeHelper().getComponent(componentName));
-                        } catch(Throwable t) {
-                            // TODO: Anything else but ignore ??
-                            Throwable cause = t.getCause();
-                        }
-                    }
+                // Activate the composites
+                for(Composite composite: composites) {
+                    eScaDomain.getCompositeActivator().activate(composite);
+                }
+
+                // Start the composites
+                for(Composite composite: composites) {
+                    eScaDomain.getCompositeActivator().start(composite);
                 }
+                
                 scaDomain = eScaDomain;
             } else {
                 String[] composites = SCADomainHelper.getDeployableComposites(classLoader,
serverInfo, abstractName, jarFileName);
@@ -137,27 +114,31 @@
             } else {
                 EmbeddedSCADomain eScaDomain = (EmbeddedSCADomain)scaDomain;
                 
-                // Remove contribution
-                eScaDomain.getContributionService().remove(contributionRoot);
-
-                // Stop all the components
-                for (DeployedArtifact artifact : contribution.getArtifacts()) {
+                // Collect the composites
+                List<Composite> composites = new ArrayList<Composite>();
+                for(DeployedArtifact artifact : contribution.getArtifacts()) {
                     if (artifact.getModel() instanceof Composite) {
-                        Composite composite = (Composite)artifact.getModel();
-                        for(Component component: composite.getComponents()) {
-                            eScaDomain.getDomainCompositeHelper().stopComponent(eScaDomain.getDomainCompositeHelper().getComponent(component.getName()));
-                            embeddedSCADomainRef.getAllComponentNames().remove(component.getName());
-                        }
+                        composites.add((Composite)artifact.getModel());
                     }
                 }
+
+                // Stop the composites
+                for(Composite composite: composites) {
+                    eScaDomain.getCompositeActivator().stop(composite);
+                }
                 
-                // Remove composites
-                for (DeployedArtifact artifact : contribution.getArtifacts()) {
-                    if (artifact.getModel() instanceof Composite) {
-                        Composite composite = (Composite)artifact.getModel();
-                        eScaDomain.getDomainCompositeHelper().removeComposite(composite);
-                    }
+                // Deactivate the composites
+                for(Composite composite: composites) {
+                    eScaDomain.getCompositeActivator().deactivate(composite);
+                }
+
+                // Remove the composites
+                for(Composite composite: composites) {
+                    eScaDomain.getDomainComposite().getIncludes().remove(composite);
                 }
+
+                // Remove contribution
+                eScaDomain.getContributionService().remove(contributionRoot);
             }
         }        
     }
@@ -178,7 +159,6 @@
             infoFactory.addReference("embeddedSCADomainRef", EmbeddedSCADomainGBean.class);
             infoFactory.addAttribute("SCADomain", "org.apache.tuscany.sca.host.embedded.SCADomain",
false, true);
             infoFactory.addAttribute("useEmbeddedDomain", boolean.class, true, true);
-            infoFactory.addAttribute("startOtherComponents", boolean.class, true, true);
             infoFactory.addInterface(SCADomainInterface.class);
             infoFactory.setConstructor(new String[]{"embeddedSCADomainRef", "classLoader","serverInfo","abstractName"});
             GBEAN_INFO = infoFactory.getBeanInfo();
@@ -202,9 +182,5 @@
 
         public void setUseEmbeddedDomain(boolean useEmbeddedDomain) {
             this.useEmbeddedDomain = useEmbeddedDomain;
-        }
-
-        public void setStartOtherComponents(boolean startOtherComponents) {
-            this.startOtherComponents = startOtherComponents;
         }
 }

Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java?view=diff&rev=567092&r1=567091&r2=567092
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java
(original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/TuscanyBuilder.java
Fri Aug 17 10:34:47 2007
@@ -20,10 +20,8 @@
 package org.apache.geronimo.tuscany;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URI;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Enumeration;
@@ -31,17 +29,13 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
-import javax.xml.namespace.QName;
-
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.ConfigurationBuilder;
 import org.apache.geronimo.deployment.DeploymentContext;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
 import org.apache.geronimo.deployment.service.EnvironmentBuilder;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
-import org.apache.geronimo.deployment.xbeans.ArtifactType;
 import org.apache.geronimo.deployment.xbeans.EnvironmentType;
-import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanData;
@@ -67,18 +61,15 @@
     private final Collection repositories;
     private final Naming naming;
     private final ConfigurationManager configurationManager;    
-    private final ClassLoader classLoader;    
     private final AbstractNameQuery serverInfoQuery;
     private final AbstractNameQuery embeddedSCADomainQuery;
     private boolean useEmbeddedDomain = true;
-    private boolean startOtherComponents = true;
     
     public TuscanyBuilder(Environment defaultEnvironment, Collection repositories, Kernel
kernel, ClassLoader classLoader, AbstractNameQuery serverInfoQuery, AbstractNameQuery embeddedSCADomainQuery)
{
         this.defaultEnvironment = defaultEnvironment;
         this.repositories = repositories;        
         naming = kernel.getNaming();
         configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
-        this.classLoader = classLoader;        
         this.serverInfoQuery = serverInfoQuery;
         this.embeddedSCADomainQuery = embeddedSCADomainQuery;
     }
@@ -88,7 +79,6 @@
         this.repositories = null;        
         naming = null;
         configurationManager = null;
-        this.classLoader = null;        
         this.serverInfoQuery = null;
         this.embeddedSCADomainQuery = null;
     }
@@ -205,7 +195,6 @@
         data.setReferencePattern("embeddedSCADomainRef", embeddedSCADomainQuery);
         data.setReferencePattern("serverInfo", serverInfoQuery);
         data.setAttribute("useEmbeddedDomain", useEmbeddedDomain);
-        data.setAttribute("startOtherComponents", startOtherComponents);
         data.setAttribute("jarFileName",jarFileName);
         return data;
     }    
@@ -214,10 +203,6 @@
         this.useEmbeddedDomain = useEmbeddedDomain;
     }
 
-    public void setStartOtherComponents(boolean startOtherComponents) {
-        this.startOtherComponents = startOtherComponents;
-    }
-    
     public static final GBeanInfo GBEAN_INFO;
 
     static {
@@ -228,7 +213,6 @@
         infoFactory.addAttribute("serverInfoQuery", AbstractNameQuery.class, true, true);
         infoFactory.addAttribute("embeddedSCADomainQuery", AbstractNameQuery.class, true,
true);
         infoFactory.addAttribute("useEmbeddedDomain", boolean.class, true, true);
-        infoFactory.addAttribute("startOtherComponents", boolean.class, true, true);
         infoFactory.addAttribute("kernel", Kernel.class, false, false);
         infoFactory.addAttribute("classLoader",ClassLoader.class,false);
         infoFactory.addReference("Repository", Repository.class, "Repository");

Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/pom.xml?view=diff&rev=567092&r1=567091&r2=567092
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/pom.xml (original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/pom.xml Fri Aug 17 10:34:47 2007
@@ -22,7 +22,7 @@
     </scm>
 	
     <properties>
-        <geronimoVersion>2.0</geronimoVersion> 
+        <geronimoVersion>2.0.1</geronimoVersion> 
         <tuscanyVersion>1.0-incubating-SNAPSHOT</tuscanyVersion>
     </properties>
     <modules>
@@ -50,52 +50,22 @@
             <id>apache-incubating</id>
             <name>Apache Incubating Repository</name>
             <url>http://people.apache.org/repo/m2-incubating-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
         </repository>
         <repository>
             <id>ws.zones</id>
             <name>ws.zones</name>
             <url>http://ws.zones.apache.org/repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
         </repository>
          <repository>
             <id>apache-snapshots</id>
             <name>Apache Snapshots Repository</name>
             <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
         </repository>
 
         <repository>
             <id>tomcat-m2-repo</id>
             <name>Codehaus M2 Repository</name>
             <url>http://repository.codehaus.org</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
         </repository>
        <!--repository>
             <id>ibiblio-m2-repo</id>
@@ -113,25 +83,11 @@
             <id>temp-repo</id>
             <name>Temp M2 Repository</name>
             <url>http://people.apache.org/~manugeorge/repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
         </repository>
         <repository>
             <id>ussg-maven-repo</id>
             <name>USSG M2 Repository</name>
             <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
         </repository>
 
     </repositories>

Modified: geronimo/sandbox/tuscany-integration/miscellaneous/tuscany-plugin-1.0.car
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/miscellaneous/tuscany-plugin-1.0.car?view=diff&rev=567092&r1=567091&r2=567092
==============================================================================
Binary files - no diff available.

Modified: geronimo/sandbox/tuscany-integration/samples/Calculator/calculator.jar
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/samples/Calculator/calculator.jar?view=diff&rev=567092&r1=567091&r2=567092
==============================================================================
Binary files - no diff available.

Modified: geronimo/sandbox/tuscany-integration/samples/helloWorld-ws.jar
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/samples/helloWorld-ws.jar?view=diff&rev=567092&r1=567091&r2=567092
==============================================================================
Binary files - no diff available.



Mime
View raw message