ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1301381 [4/4] - in /ace/trunk: ./ ace-ant-tasks/ ace-client-automation/ ace-client-automation/src/main/java/org/apache/ace/client/automation/ ace-client-repository-api/ ace-client-repository-api/src/main/java/org/apache/ace/client/reposito...
Date Fri, 16 Mar 2012 08:58:23 GMT
Modified: ace/trunk/ace-util/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-util/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-util/pom.xml (original)
+++ ace/trunk/ace-util/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.util</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-util</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-util</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-target-devserver</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-util</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-util</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-target-devserver</url>
     </scm>
 
     <properties>

Modified: ace/trunk/ace-webconsole-plugin/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-webconsole-plugin/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-webconsole-plugin/pom.xml (original)
+++ ace/trunk/ace-webconsole-plugin/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.webconsole.plugin</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-webconsole-plugin</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-webconsole-plugin</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-webconsole-plugin</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-webconsole-plugin</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-webconsole-plugin</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-webconsole-plugin</url>
     </scm>
     
     <properties>
@@ -71,4 +71,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-webui-vaadin/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-webui-vaadin/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-webui-vaadin/pom.xml (original)
+++ ace/trunk/ace-webui-vaadin/pom.xml Fri Mar 16 08:58:19 2012
@@ -24,11 +24,11 @@
     <parent>
         <groupId>org.apache.ace</groupId>
         <artifactId>ace-pom</artifactId>
-        <version>0.8.1-incubator-SNAPSHOT</version>
+        <version>0.8.1-SNAPSHOT</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <artifactId>org.apache.ace.webui.vaadin</artifactId>
     <packaging>bundle</packaging>
 
@@ -36,9 +36,9 @@
     <description />
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-webui-vaadin</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/ace-webui-vaadin</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/ace-webui-vaadin</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/ace-webui-vaadin</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/ace-webui-vaadin</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/ace-webui-vaadin</url>
     </scm>
 
     <properties>
@@ -92,4 +92,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>

Modified: ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/domain/NamedTargetObject.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/domain/NamedTargetObject.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/domain/NamedTargetObject.java
(original)
+++ ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/domain/NamedTargetObject.java
Fri Mar 16 08:58:19 2012
@@ -1,27 +1,27 @@
 package org.apache.ace.webui.domain;
 
 import org.apache.ace.client.repository.RepositoryObject;
-import org.apache.ace.client.repository.object.GatewayObject;
-import org.apache.ace.client.repository.stateful.StatefulGatewayObject;
+import org.apache.ace.client.repository.object.TargetObject;
+import org.apache.ace.client.repository.stateful.StatefulTargetObject;
 import org.apache.ace.webui.NamedObject;
 
 public class NamedTargetObject implements NamedObject {
     private final RepositoryObject m_target;
 
-    public NamedTargetObject(StatefulGatewayObject target) {
+    public NamedTargetObject(StatefulTargetObject target) {
         m_target = target;
     }
 
-    public NamedTargetObject(GatewayObject target) {
+    public NamedTargetObject(TargetObject target) {
         m_target = target;
     }
 
     public String getName() {
-        if (m_target instanceof StatefulGatewayObject) {
-            return ((StatefulGatewayObject) m_target).getID();
+        if (m_target instanceof StatefulTargetObject) {
+            return ((StatefulTargetObject) m_target).getID();
         }
-        else if (m_target instanceof GatewayObject) {
-            return ((GatewayObject) m_target).getID();
+        else if (m_target instanceof TargetObject) {
+            return ((TargetObject) m_target).getID();
         }
         return null;
     }

Modified: ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/Activator.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/Activator.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/Activator.java (original)
+++ ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/Activator.java Fri
Mar 16 08:58:19 2012
@@ -23,7 +23,7 @@ import java.util.Properties;
 
 import javax.servlet.Servlet;
 
-import org.apache.ace.client.repository.stateful.StatefulGatewayObject;
+import org.apache.ace.client.repository.stateful.StatefulTargetObject;
 import org.apache.ace.webui.NamedObject;
 import org.apache.ace.webui.UIExtensionFactory;
 import org.apache.felix.dm.DependencyActivatorBase;
@@ -66,7 +66,7 @@ public class Activator extends Dependenc
                     VerticalLayout vl = new VerticalLayout();
                     vl.setCaption("Info");
                     final NamedObject namedObject = (NamedObject) context.get("object");
-                    final StatefulGatewayObject target = (StatefulGatewayObject) namedObject.getObject();
+                    final StatefulTargetObject target = (StatefulTargetObject) namedObject.getObject();
                     Label info = new Label(
                         "Target ID          : " + namedObject.getName() + "\n" +
                         "Installed version  : " + (target.getLastInstallVersion() == null
? "(none)" : target.getLastInstallVersion()) + "\n" +

Modified: ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/Associations.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/Associations.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/Associations.java
(original)
+++ ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/Associations.java
Fri Mar 16 08:58:19 2012
@@ -7,10 +7,10 @@ import java.util.Set;
 import org.apache.ace.client.repository.ObjectRepository;
 import org.apache.ace.client.repository.RepositoryObject;
 import org.apache.ace.client.repository.object.ArtifactObject;
-import org.apache.ace.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.object.TargetObject;
 import org.apache.ace.client.repository.object.GroupObject;
 import org.apache.ace.client.repository.object.LicenseObject;
-import org.apache.ace.client.repository.stateful.StatefulGatewayObject;
+import org.apache.ace.client.repository.stateful.StatefulTargetObject;
 import org.apache.ace.webui.NamedObject;
 import org.apache.ace.webui.domain.NamedArtifactObject;
 import org.apache.ace.webui.domain.NamedDistributionObject;
@@ -92,11 +92,11 @@ public class Associations {
         else if (object instanceof LicenseObject) {
             return new NamedDistributionObject((LicenseObject) object);
         }
-        else if (object instanceof StatefulGatewayObject) {
-            return new NamedTargetObject((StatefulGatewayObject) object);
+        else if (object instanceof StatefulTargetObject) {
+            return new NamedTargetObject((StatefulTargetObject) object);
         }
-        else if (object instanceof GatewayObject) {
-            return new NamedTargetObject((GatewayObject) object);
+        else if (object instanceof TargetObject) {
+            return new NamedTargetObject((TargetObject) object);
         }
         return null;
     }
@@ -200,8 +200,8 @@ public class Associations {
             RepositoryObject object = null;
             if (value instanceof String) {
                 object = m_repository.get((String) value);
-                if (object instanceof StatefulGatewayObject) {
-                    StatefulGatewayObject sgo = (StatefulGatewayObject) object;
+                if (object instanceof StatefulTargetObject) {
+                    StatefulTargetObject sgo = (StatefulTargetObject) object;
                     if (sgo.isRegistered()) {
                         object = sgo.getGatewayObject();
                     }

Modified: ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinClient.java
URL: http://svn.apache.org/viewvc/ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinClient.java?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinClient.java
(original)
+++ ace/trunk/ace-webui-vaadin/src/main/java/org/apache/ace/webui/vaadin/VaadinClient.java
Fri Mar 16 08:58:19 2012
@@ -39,7 +39,7 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.helper.bundle.BundleHelper;
 import org.apache.ace.client.repository.object.Artifact2GroupAssociation;
 import org.apache.ace.client.repository.object.ArtifactObject;
-import org.apache.ace.client.repository.object.GatewayObject;
+import org.apache.ace.client.repository.object.TargetObject;
 import org.apache.ace.client.repository.object.Group2LicenseAssociation;
 import org.apache.ace.client.repository.object.GroupObject;
 import org.apache.ace.client.repository.object.License2GatewayAssociation;
@@ -50,8 +50,8 @@ import org.apache.ace.client.repository.
 import org.apache.ace.client.repository.repository.GroupRepository;
 import org.apache.ace.client.repository.repository.License2GatewayAssociationRepository;
 import org.apache.ace.client.repository.repository.LicenseRepository;
-import org.apache.ace.client.repository.stateful.StatefulGatewayObject;
-import org.apache.ace.client.repository.stateful.StatefulGatewayRepository;
+import org.apache.ace.client.repository.stateful.StatefulTargetObject;
+import org.apache.ace.client.repository.stateful.StatefulTargetRepository;
 import org.apache.ace.test.utils.FileUtils;
 import org.apache.ace.webui.NamedObject;
 import org.apache.ace.webui.UIExtensionFactory;
@@ -129,7 +129,7 @@ public class VaadinClient extends com.va
     private volatile ArtifactRepository m_artifactRepository;
     private volatile GroupRepository m_featureRepository;
     private volatile LicenseRepository m_distributionRepository;
-    private volatile StatefulGatewayRepository m_statefulTargetRepository;
+    private volatile StatefulTargetRepository m_statefulTargetRepository;
     private volatile Artifact2GroupAssociationRepository m_artifact2GroupAssociationRepository;
     private volatile Group2LicenseAssociationRepository m_group2LicenseAssociationRepository;
     private volatile License2GatewayAssociationRepository m_license2GatewayAssociationRepository;
@@ -143,7 +143,7 @@ public class VaadinClient extends com.va
     private ObjectPanel m_targetsPanel;
     private List<ArtifactObject> m_artifacts;
     private List<GroupObject> m_features;
-    private List<StatefulGatewayObject> m_targets;
+    private List<StatefulTargetObject> m_targets;
     private final Associations m_associations = new Associations();
 
     private GridLayout m_grid;
@@ -180,7 +180,7 @@ public class VaadinClient extends com.va
         addDependency(component, Artifact2GroupAssociationRepository.class);
         addDependency(component, Group2LicenseAssociationRepository.class);
         addDependency(component, License2GatewayAssociationRepository.class);
-        addDependency(component, StatefulGatewayRepository.class);
+        addDependency(component, StatefulTargetRepository.class);
     }
 
     // @formatter:off
@@ -309,14 +309,14 @@ public class VaadinClient extends com.va
         m_grid.addComponent(progress, 0, 3);
 
         m_artifactsPanel.addListener(m_associations.createSelectionListener(m_artifactsPanel,
m_artifactRepository,
-            new Class[] {}, new Class[] { GroupObject.class, LicenseObject.class, GatewayObject.class
},
+            new Class[] {}, new Class[] { GroupObject.class, LicenseObject.class, TargetObject.class
},
             new Table[] { m_featuresPanel, m_distributionsPanel, m_targetsPanel }));
         m_featuresPanel.addListener(m_associations.createSelectionListener(m_featuresPanel,
m_featureRepository,
-            new Class[] { ArtifactObject.class }, new Class[] { LicenseObject.class, GatewayObject.class
},
+            new Class[] { ArtifactObject.class }, new Class[] { LicenseObject.class, TargetObject.class
},
             new Table[] { m_artifactsPanel, m_distributionsPanel, m_targetsPanel }));
         m_distributionsPanel
             .addListener(m_associations.createSelectionListener(m_distributionsPanel, m_distributionRepository,
-                new Class[] { GroupObject.class, ArtifactObject.class }, new Class[] { GatewayObject.class
},
+                new Class[] { GroupObject.class, ArtifactObject.class }, new Class[] { TargetObject.class
},
                 new Table[] { m_artifactsPanel, m_featuresPanel, m_targetsPanel }));
         m_targetsPanel.addListener(m_associations.createSelectionListener(m_targetsPanel,
m_statefulTargetRepository,
             new Class[] { LicenseObject.class, GroupObject.class, ArtifactObject.class },
new Class[] {},
@@ -381,7 +381,7 @@ public class VaadinClient extends com.va
 
             @Override
             protected void associateFromRight(String left, String right) {
-                StatefulGatewayObject target = getTarget(right);
+                StatefulTargetObject target = getTarget(right);
                 if (!target.isRegistered()) {
                     target.register();
                     target.setAutoApprove(true);
@@ -392,7 +392,7 @@ public class VaadinClient extends com.va
         m_targetsPanel.setDropHandler(new AssociationDropHandler(m_distributionsPanel, (Table)
null) {
             @Override
             protected void associateFromLeft(String left, String right) {
-                StatefulGatewayObject target = getTarget(right);
+                StatefulTargetObject target = getTarget(right);
                 if (!target.isRegistered()) {
                     target.register();
                     target.setAutoApprove(true);
@@ -408,7 +408,7 @@ public class VaadinClient extends com.va
         addListener(m_artifactsPanel, ArtifactObject.TOPIC_ALL);
         addListener(m_featuresPanel, GroupObject.TOPIC_ALL);
         addListener(m_distributionsPanel, LicenseObject.TOPIC_ALL);
-        addListener(m_targetsPanel, StatefulGatewayObject.TOPIC_ALL);
+        addListener(m_targetsPanel, StatefulTargetObject.TOPIC_ALL);
         m_mainWindow.addComponent(m_grid);
     }
 
@@ -426,7 +426,7 @@ public class VaadinClient extends com.va
             // @formatter:off
             context.addShopRepository(new URL(m_aceHost, endpoint), customerName, shopRepo,
true)
                 .setObrBase(m_obrUrl)
-                .addGatewayRepository(new URL(m_aceHost, endpoint), customerName, gatewayRepo,
true)
+                .addTargetRepository(new URL(m_aceHost, endpoint), customerName, gatewayRepo,
true)
                 .addDeploymentRepository(new URL(m_aceHost, endpoint), customerName, deployRepo,
true);
             // @formatter:on
             m_admin.login(context);
@@ -732,7 +732,7 @@ public class VaadinClient extends com.va
                         @Override
                         protected void removeLinkFromRight(LicenseObject object, RepositoryObject
other) {
                             List<License2GatewayAssociation> associations = object
-                                .getAssociationsWith((GatewayObject) other);
+                                .getAssociationsWith((TargetObject) other);
                             for (License2GatewayAssociation association : associations) {
                                 m_license2GatewayAssociationRepository.remove(association);
                             }
@@ -770,35 +770,35 @@ public class VaadinClient extends com.va
 
             public void populate() {
                 removeAllItems();
-                for (StatefulGatewayObject statefulTarget : m_statefulTargetRepository.get())
{
+                for (StatefulTargetObject statefulTarget : m_statefulTargetRepository.get())
{
                     add(statefulTarget);
                 }
             }
 
             public void handleEvent(org.osgi.service.event.Event event) {
-                StatefulGatewayObject statefulTarget = (StatefulGatewayObject) event
-                    .getProperty(StatefulGatewayObject.EVENT_ENTITY);
+                StatefulTargetObject statefulTarget = (StatefulTargetObject) event
+                    .getProperty(StatefulTargetObject.EVENT_ENTITY);
                 String topic = (String) event.getProperty(EventConstants.EVENT_TOPIC);
-                if (StatefulGatewayObject.TOPIC_ADDED.equals(topic)) {
+                if (StatefulTargetObject.TOPIC_ADDED.equals(topic)) {
                     add(statefulTarget);
                 }
-                if (StatefulGatewayObject.TOPIC_REMOVED.equals(topic)) {
+                if (StatefulTargetObject.TOPIC_REMOVED.equals(topic)) {
                     remove(statefulTarget);
                 }
-                if (StatefulGatewayObject.TOPIC_CHANGED.equals(topic)) {
+                if (StatefulTargetObject.TOPIC_CHANGED.equals(topic)) {
                     change(statefulTarget);
                 }
             }
 
-            private void add(StatefulGatewayObject statefulTarget) {
+            private void add(StatefulTargetObject statefulTarget) {
                 Item item = addItem(statefulTarget.getDefinition());
                 if (item != null) {
                     item.getItemProperty(OBJECT_NAME).setValue(statefulTarget.getID());
                     item.getItemProperty(OBJECT_DESCRIPTION).setValue("");
-                    Button removeLinkButton = new RemoveLinkButton<StatefulGatewayObject>(statefulTarget,
+                    Button removeLinkButton = new RemoveLinkButton<StatefulTargetObject>(statefulTarget,
                         m_distributionsPanel, null) {
                         @Override
-                        protected void removeLinkFromLeft(StatefulGatewayObject object, RepositoryObject
other) {
+                        protected void removeLinkFromLeft(StatefulTargetObject object, RepositoryObject
other) {
                             List<License2GatewayAssociation> associations = object
                                 .getAssociationsWith((LicenseObject) other);
                             for (License2GatewayAssociation association : associations) {
@@ -809,7 +809,7 @@ public class VaadinClient extends com.va
                         }
 
                         @Override
-                        protected void removeLinkFromRight(StatefulGatewayObject object,
RepositoryObject other) {
+                        protected void removeLinkFromRight(StatefulTargetObject object, RepositoryObject
other) {
                         }
                     };
                     HorizontalLayout buttons = new HorizontalLayout();
@@ -824,14 +824,14 @@ public class VaadinClient extends com.va
                 }
             }
 
-            private void change(StatefulGatewayObject statefulTarget) {
+            private void change(StatefulTargetObject statefulTarget) {
                 Item item = getItem(statefulTarget.getDefinition());
                 if (item != null) {
                     item.getItemProperty(OBJECT_DESCRIPTION).setValue("");
                 }
             }
 
-            private void remove(StatefulGatewayObject statefulTarget) {
+            private void remove(StatefulTargetObject statefulTarget) {
                 removeItem(statefulTarget.getDefinition());
             }
         };
@@ -1010,8 +1010,8 @@ public class VaadinClient extends com.va
      */
     private void createTarget(String name, String description) {
         Map<String, String> attributes = new HashMap<String, String>();
-        attributes.put(StatefulGatewayObject.KEY_ID, name);
-        attributes.put(GatewayObject.KEY_AUTO_APPROVE, "true");
+        attributes.put(StatefulTargetObject.KEY_ID, name);
+        attributes.put(TargetObject.KEY_AUTO_APPROVE, "true");
         Map<String, String> tags = new HashMap<String, String>();
         m_statefulTargetRepository.preregister(attributes, tags);
     }
@@ -1042,7 +1042,7 @@ public class VaadinClient extends com.va
         return m_distributionRepository.get(name);
     }
 
-    private StatefulGatewayObject getTarget(String name) {
+    private StatefulTargetObject getTarget(String name) {
         return m_statefulTargetRepository.get(name);
     }
 

Modified: ace/trunk/check_staged_release.sh
URL: http://svn.apache.org/viewvc/ace/trunk/check_staged_release.sh?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/check_staged_release.sh (original)
+++ ace/trunk/check_staged_release.sh Fri Mar 16 08:58:19 2012
@@ -7,7 +7,7 @@ mkdir ${DOWNLOAD} 2>/dev/null
 # The following code automatically imports the signing KEYS, but it may actually be
 # better to download them from a key server and/or let the user choose what keys
 # he wants to import.
-#wget --no-check-certificate -P "${DOWNLOAD}" http://svn.apache.org/repos/asf/incubator/ace/trunk/KEYS

+#wget --no-check-certificate -P "${DOWNLOAD}" http://svn.apache.org/repos/asf/ace/trunk/KEYS

 #gpg --import "${DOWNLOAD}/KEYS"
 
 if [ -z "${STAGING}" -o ! -d "${DOWNLOAD}" ]

Modified: ace/trunk/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/pom.xml (original)
+++ ace/trunk/pom.xml Fri Mar 16 08:58:19 2012
@@ -28,7 +28,7 @@
 
     <groupId>org.apache.ace</groupId>
     <artifactId>ace-reactor</artifactId>
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Apache ACE :: Reactor</name>
     <modules>
@@ -132,9 +132,9 @@
     </modules>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk</url>
     </scm>
 
     <build>

Modified: ace/trunk/pom/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/pom/pom.xml?rev=1301381&r1=1301380&r2=1301381&view=diff
==============================================================================
--- ace/trunk/pom/pom.xml (original)
+++ ace/trunk/pom/pom.xml Fri Mar 16 08:58:19 2012
@@ -29,7 +29,7 @@
     <groupId>org.apache.ace</groupId>
     <artifactId>ace-pom</artifactId>
     <name>Apache ACE :: POM</name>
-    <version>0.8.1-incubator-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <inceptionYear>2009</inceptionYear>
 
@@ -37,7 +37,7 @@
         This pom provides project information that is common to all ACE sub-projects.
     </description>
 
-    <url>http://incubator.apache.org/ace/</url>
+    <url>http://ace.apache.org/</url>
 
     <issueManagement>
         <system>jira</system>
@@ -46,16 +46,22 @@
 
     <mailingLists>
         <mailingList>
+            <name>Apache ACE Users List</name>
+            <subscribe>users-subscribe@ace.apache.org</subscribe>
+            <unsubscribe>users-unsubscribe@ace.apache.org</unsubscribe>
+            <post>users@ace.apache.org</post>
+        </mailingList>
+        <mailingList>
             <name>Apache ACE Developer List</name>
-            <subscribe>ace-dev-subscribe@incubator.apache.org</subscribe>
-            <unsubscribe>ace-dev-unsubscribe@incubator.apache.org</unsubscribe>
-            <post>ace-dev@incubator.apache.org</post>
+            <subscribe>dev-subscribe@ace.apache.org</subscribe>
+            <unsubscribe>dev-unsubscribe@ace.apache.org</unsubscribe>
+            <post>dev@ace.apache.org</post>
         </mailingList>
         <mailingList>
             <name>Apache ACE SCM List</name>
-            <subscribe>ace-commits-subscribe@incubator.apache.org</subscribe>
-            <unsubscribe>ace-commits-unsubscribe@incubator.apache.org</unsubscribe>
-            <post>ace-commits@incubator.apache.org</post>
+            <subscribe>commits-subscribe@ace.apache.org</subscribe>
+            <unsubscribe>commits-unsubscribe@ace.apache.org</unsubscribe>
+            <post>commits@ace.apache.org</post>
         </mailingList>
     </mailingLists>
 
@@ -111,9 +117,9 @@
     </developers>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/ace/trunk/pom</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/ace/trunk/pom</developerConnection>
-        <url>http://svn.apache.org/repos/asf/incubator/ace/trunk/pom</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/ace/trunk/pom</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ace/trunk/pom</developerConnection>
+        <url>http://svn.apache.org/repos/asf/ace/trunk/pom</url>
     </scm>
 
     <properties>
@@ -199,7 +205,9 @@
                         <configuration>
                             <resourceBundles>
                                 <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+<!--
                                 <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
+-->
                             </resourceBundles>
                         </configuration>
                     </execution>
@@ -273,7 +281,7 @@
                   <groupId>org.apache.maven.plugins</groupId>
                   <artifactId>maven-release-plugin</artifactId>
                   <configuration>
-                     <tagBase>https://svn.apache.org/repos/asf/incubator/ace/releases</tagBase>
+                     <tagBase>https://svn.apache.org/repos/asf/ace/releases</tagBase>
                   </configuration>
                 </plugin>
             </plugins>



Mime
View raw message