From ace-commits-returnaaron59@example.net Thu Oct 01 18:36:57 2009 Return-Path: <ace-commits-returnaaron59@example.net> Delivered-To: aaron59@example.net Received: (qmail 2485 invoked from network); 1 Oct 2009 18:36:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Oct 2009 18:36:57 -0000 Received: (qmail 91538 invoked by uid 500); 1 Oct 2009 18:36:57 -0000 Delivered-To: aaron59@example.net Received: (qmail 91518 invoked by uid 500); 1 Oct 2009 18:36:57 -0000 Mailing-List: contact aaron59@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:aaron59@example.net> List-Unsubscribe: <mailto:aaron59@example.net> List-Post: <mailto:aaron59@example.net> List-Id: <ace-commits.incubator.apache.org> Reply-To: aaron59@example.net Delivered-To: mailing list aaron59@example.net Received: (qmail 91508 invoked by uid 99); 1 Oct 2009 18:36:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Oct 2009 18:36:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Oct 2009 18:36:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 134C523888D4; Thu, 1 Oct 2009 18:36:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r820744 - in /incubator/ace/trunk/webui/src/org/apache/ace: client/Main.java server/Activator.java server/AssociationServiceImpl.java server/CheckoutServiceImpl.java Date: Thu, 01 Oct 2009 18:36:32 -0000 To: aaron59@example.net From: aaron59@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <aaron59@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: angelos Date: Thu Oct 1 18:36:32 2009 New Revision: 820744 URL: http://svn.apache.org/viewvc?rev=820744&view=rev Log: ACE-40 Retrieving associations does not make sense for StatefulGatewayObjects which are not backed by a GatewayObject, so these are ignored now. Modified: incubator/ace/trunk/webui/src/org/apache/ace/client/Main.java incubator/ace/trunk/webui/src/org/apache/ace/server/Activator.java incubator/ace/trunk/webui/src/org/apache/ace/server/AssociationServiceImpl.java incubator/ace/trunk/webui/src/org/apache/ace/server/CheckoutServiceImpl.java Modified: incubator/ace/trunk/webui/src/org/apache/ace/client/Main.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/webui/src/org/apache/ace/client/Main.java?rev=820744&r1=820743&r2=820744&view=diff ============================================================================== --- incubator/ace/trunk/webui/src/org/apache/ace/client/Main.java (original) +++ incubator/ace/trunk/webui/src/org/apache/ace/client/Main.java Thu Oct 1 18:36:32 2009 @@ -42,8 +42,6 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.FlexTable; -import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.ScrollPanel; Modified: incubator/ace/trunk/webui/src/org/apache/ace/server/Activator.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/webui/src/org/apache/ace/server/Activator.java?rev=820744&r1=820743&r2=820744&view=diff ============================================================================== --- incubator/ace/trunk/webui/src/org/apache/ace/server/Activator.java (original) +++ incubator/ace/trunk/webui/src/org/apache/ace/server/Activator.java Thu Oct 1 18:36:32 2009 @@ -38,6 +38,7 @@ private static volatile Activator m_instance; private volatile SessionFactory m_sessionFactory; + private volatile LogService m_log; static Activator instance() { return m_instance; @@ -47,6 +48,10 @@ return m_context; } + LogService getLog() { + return m_log; + } + static void destroySession(String sessionID) { m_instance.m_sessionFactory.destroySession(sessionID); } @@ -151,6 +156,7 @@ manager.add(createService() .setImplementation(this) .add(createServiceDependency().setRequired(true).setService(SessionFactory.class)) + .add(createServiceDependency().setService(LogService.class).setRequired(false)) ); } @Override Modified: incubator/ace/trunk/webui/src/org/apache/ace/server/AssociationServiceImpl.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/webui/src/org/apache/ace/server/AssociationServiceImpl.java?rev=820744&r1=820743&r2=820744&view=diff ============================================================================== --- incubator/ace/trunk/webui/src/org/apache/ace/server/AssociationServiceImpl.java (original) +++ incubator/ace/trunk/webui/src/org/apache/ace/server/AssociationServiceImpl.java Thu Oct 1 18:36:32 2009 @@ -39,6 +39,7 @@ import org.apache.ace.client.services.GroupDescriptor; import org.apache.ace.client.services.LicenseDescriptor; import org.apache.ace.client.services.TargetDescriptor; +import org.osgi.service.log.LogService; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -138,13 +139,19 @@ } public Descriptor[] getRelated(Descriptor o) throws Exception { - HttpServletRequest request = getThreadLocalRequest(); - RepositoryObject a = ObjectMapping.unwrap(request, o); - List<RepositoryObject> relatedObjects = getRelated(request, a); - List<Descriptor> descriptors = ObjectMapping.wrap(relatedObjects); - return descriptors.toArray(new Descriptor[descriptors.size()]); + try { + HttpServletRequest request = getThreadLocalRequest(); + RepositoryObject a = ObjectMapping.unwrap(request, o); + List<RepositoryObject> relatedObjects = getRelated(request, a); + List<Descriptor> descriptors = ObjectMapping.wrap(relatedObjects); + return descriptors.toArray(new Descriptor[descriptors.size()]); + } + catch (Exception e) { + Activator.instance().getLog().log(LogService.LOG_ERROR, "Error getting related objects", e); + throw e; + } } - + /** * Helper method that finds all related {@link RepositoryObject}s for a given one. */ @@ -174,7 +181,8 @@ result.addAll(groups); result.addAll(TargetServiceImpl.instance().findSGOs(request, targets)); } - else if (object instanceof StatefulGatewayObject) { + else if (object instanceof StatefulGatewayObject && ((StatefulGatewayObject) object).isRegistered()) { + // We can ignore any non-registered SGO's, since these will never have any associations. List<LicenseObject> licenses = getRelated(object, LicenseObject.class); List<GroupObject> groups = getRelated(licenses, GroupObject.class); List<ArtifactObject> artifacts = getRelated(groups, ArtifactObject.class); Modified: incubator/ace/trunk/webui/src/org/apache/ace/server/CheckoutServiceImpl.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/webui/src/org/apache/ace/server/CheckoutServiceImpl.java?rev=820744&r1=820743&r2=820744&view=diff ============================================================================== --- incubator/ace/trunk/webui/src/org/apache/ace/server/CheckoutServiceImpl.java (original) +++ incubator/ace/trunk/webui/src/org/apache/ace/server/CheckoutServiceImpl.java Thu Oct 1 18:36:32 2009 @@ -24,7 +24,6 @@ import org.apache.ace.client.repository.RepositoryAdmin; import org.apache.ace.client.repository.RepositoryAdminLoginContext; -import org.apache.ace.client.repository.stateful.StatefulGatewayRepository; import org.apache.ace.client.services.CheckoutService; import org.osgi.service.useradmin.User; import org.osgi.service.useradmin.UserAdmin; From ace-commits-returnaaron59@example.net Thu Oct 01 18:42:01 2009 Return-Path: <ace-commits-returnaaron59@example.net> Delivered-To: aaron59@example.net Received: (qmail 3727 invoked from network); 1 Oct 2009 18:42:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Oct 2009 18:42:01 -0000 Received: (qmail 3679 invoked by uid 500); 1 Oct 2009 18:42:01 -0000 Delivered-To: aaron59@example.net Received: (qmail 3658 invoked by uid 500); 1 Oct 2009 18:42:01 -0000 Mailing-List: contact aaron59@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:aaron59@example.net> List-Unsubscribe: <mailto:aaron59@example.net> List-Post: <mailto:aaron59@example.net> List-Id: <ace-commits.incubator.apache.org> Reply-To: aaron59@example.net Delivered-To: mailing list aaron59@example.net Received: (qmail 3648 invoked by uid 99); 1 Oct 2009 18:42:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Oct 2009 18:42:01 +0000 X-ASF-Spam-Status: No, hits=3.4 required=10.0 tests=HTML_MESSAGE,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [83.161.120.155] (HELO mail.atlassian.com) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Oct 2009 18:41:50 +0000 Received: from atlassian13.managed.contegix.com (atlassian13.private [83.161.120.155]) by mail.atlassian.com (Postfix) with ESMTP id 25B4716300AB for <aaron59@example.net>; Thu, 1 Oct 2009 13:40:59 -0500 (CDT) Received: from atlassian13.managed.contegix.com (atlassian13.managed.contegix.com [83.161.120.155]) by atlassian13.managed.contegix.com (Postfix) with ESMTP id 160D765B0465 for <aaron59@example.net>; Thu, 1 Oct 2009 13:40:56 -0500 (CDT) Date: Thu, 1 Oct 2009 13:40:56 -0500 (CDT) From: Atlassian Open Source Bamboo <aaron59@example.net> To: aaron59@example.net Message-ID: <15436446.aaron59@example.net> Subject: [OSS Bamboo] Apache ACE - Default build 38 has FAILED (12 tests failed, no failures were new). Change made by Angelo van der Sijpt MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_Part_287_8234769.1254422456027" X-Virus-Checked: Checked by ClamAV on apache.org ------=_Part_287_8234769.1254422456027 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline ------=_Part_287_8234769.1254422456027 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit ----------------------------------------------------------- ACE-DEF-38 failed. ----------------------------------------------------------- Code has been updated by Angelo van der Sijpt. 12/159 tests failed. http://opensource.bamboo.atlassian.com/browse/ACE-DEF-38/ -------------- Code Changes -------------- Angelo van der Sijpt (820744): >ACE-40 Retrieving associations does not make sense for StatefulGatewayObjects which are not backed by a GatewayObject, so these are ignored now. -------------- Tests -------------- Failed Tests (12) - LogIntegrationTest: Run tests (Existing) - FailTests: Fail (Existing) - ServletConfiguratorIntegrationTest: Register servlet (Existing) - ServletConfiguratorIntegrationTest: Servlet on two http services (Existing) - ServletConfiguratorIntegrationTest: Start http service (Existing) - RepositoryTest: Bad requests (Existing) - RepositoryTest: Checkout and commit (Existing) - RepositoryTest: Creation (Existing) - RepositoryTest: Get and put (Existing) - RepositoryTest: Initial content (Existing) - RepositoryTest: Master (Existing) - ConfiguratorTest: Configurator test (Existing) -------------- Error Summary -------------- Failed to parse test result file &quot;coverage.xml&quot; -- This message is automatically generated by Atlassian Bamboo ------=_Part_287_8234769.1254422456027-- From ace-commits-returnaaron59@example.net Sat Oct 03 20:48:18 2009 Return-Path: <ace-commits-returnaaron59@example.net> Delivered-To: aaron59@example.net Received: (qmail 7160 invoked from network); 3 Oct 2009 20:48:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Oct 2009 20:48:18 -0000 Received: (qmail 87747 invoked by uid 500); 3 Oct 2009 20:48:18 -0000 Delivered-To: aaron59@example.net Received: (qmail 87727 invoked by uid 500); 3 Oct 2009 20:48:18 -0000 Mailing-List: contact aaron59@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:aaron59@example.net> List-Unsubscribe: <mailto:aaron59@example.net> List-Post: <mailto:aaron59@example.net> List-Id: <ace-commits.incubator.apache.org> Reply-To: aaron59@example.net Delivered-To: mailing list aaron59@example.net Received: (qmail 87717 invoked by uid 99); 3 Oct 2009 20:48:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Oct 2009 20:48:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Oct 2009 20:48:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C737C23888CC; Sat, 3 Oct 2009 20:47:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r821409 - in /incubator/ace/trunk: core/ webui/ webui/lib/ webui/src/org/apache/ace/ webui/src/org/apache/ace/client/ Date: Sat, 03 Oct 2009 20:47:51 -0000 To: aaron59@example.net From: aaron59@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <aaron59@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: angelos Date: Sat Oct 3 20:47:50 2009 New Revision: 821409 URL: http://svn.apache.org/viewvc?rev=821409&view=rev Log: ACE-41 Added an initial version of using drag-and-drop for creating associations. This also means the checkboxes and the '<->' buttons are gone. Added: incubator/ace/trunk/webui/lib/gwt-dnd-2.6.5-javadoc.jar (with props) incubator/ace/trunk/webui/lib/gwt-dnd-2.6.5.jar (with props) Modified: incubator/ace/trunk/core/build.xml incubator/ace/trunk/webui/.classpath incubator/ace/trunk/webui/build.xml incubator/ace/trunk/webui/src/org/apache/ace/client/BundleTable.java incubator/ace/trunk/webui/src/org/apache/ace/client/GroupTable.java incubator/ace/trunk/webui/src/org/apache/ace/client/LicenseTable.java incubator/ace/trunk/webui/src/org/apache/ace/client/Main.java incubator/ace/trunk/webui/src/org/apache/ace/client/ObjectTable.java incubator/ace/trunk/webui/src/org/apache/ace/client/TargetTable.java incubator/ace/trunk/webui/src/org/apache/ace/webui.gwt.xml Modified: incubator/ace/trunk/core/build.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/core/build.xml?rev=821409&r1=821408&r2=821409&view=diff ============================================================================== --- incubator/ace/trunk/core/build.xml (original) +++ incubator/ace/trunk/core/build.xml Sat Oct 3 20:47:50 2009 @@ -521,7 +521,7 @@ <target name="package-webui" unless="webui.uptodate"> <!-- TODO add an activator to bridge between OSGi and GWT --> <copy file="../webui/webui.war" tofile="deploy/bundle/org.apache.ace.webui-1.0.0.jar"/> - <echo file="org.apache.ace.webui-1.0.0.bnd">Import-Package: org.apache.ace.log,org.apache.ace.client.repository,org.apache.ace.client.repository.object,org.apache.ace.client.repository.repository,org.apache.ace.client.repository.stateful,org.apache.ace.client.repository.helper,org.apache.ace.client.repository.helper.bundle,org.xml.sax, javax.xml.parsers, junit.framework;resolution:=optional, com.google.gwt.benchmarks;resolution:=optional, * + <echo file="org.apache.ace.webui-1.0.0.bnd">Import-Package: org.apache.ace.log,org.apache.ace.client.repository,org.apache.ace.client.repository.object,org.apache.ace.client.repository.repository,org.apache.ace.client.repository.stateful,org.apache.ace.client.repository.helper,org.apache.ace.client.repository.helper.bundle,org.xml.sax, javax.xml.parsers, junit.framework;resolution:=optional, com.google.gwt.benchmarks;resolution:=optional, com.allen_sauer.gwt.dnd.client;resolution:=optional, com.allen_sauer.gwt.dnd.client.drop;resolution:=optional, * Dynamic-ImportPackage: * Bundle-Name: Apache ACE Client Web UI Bundle-ClassPath: WEB-INF/classes, WEB-INF/lib/gwt-servlet.jar @@ -532,7 +532,7 @@ <bnd-wrap jars="deploy/bundle/org.apache.ace.webui-1.0.0.jar" output="deploy/bundle/org.apache.ace.webui-1.0.0.jar"/> <jar file="deploy/bundle/org.apache.ace.webui-1.0.0.jar" update="true"> <manifest> - <attribute name="Bundle-ClassPath" value="WEB-INF/classes, WEB-INF/lib/gwt-servlet.jar, WEB-INF/lib/felix.jar, ."/> + <attribute name="Bundle-ClassPath" value="WEB-INF/classes, WEB-INF/lib/gwt-servlet.jar, ."/> </manifest> </jar> <delete file="org.apache.ace.webui-1.0.0.bnd"/> Modified: incubator/ace/trunk/webui/.classpath URL: http://svn.apache.org/viewvc/incubator/ace/trunk/webui/.classpath?rev=821409&r1=821408&r2=821409&view=diff ============================================================================== --- incubator/ace/trunk/webui/.classpath (original) +++ incubator/ace/trunk/webui/.classpath Sat Oct 3 20:47:50 2009 @@ -7,5 +7,10 @@ <classpathentry combineaccessrules="false" kind="src" path="/core"/> <classpathentry combineaccessrules="false" kind="src" path="/server"/> <classpathentry kind="lib" path="lib/gwt/gwt-user.jar"/> + <classpathentry kind="lib" path="lib/gwt-dnd-2.6.5.jar"> + <attributes> + <attribute name="javadoc_location" value="jar:platform:/resource/webui/lib/gwt-dnd-2.6.5-javadoc.jar!/"/> + </attributes> + </classpathentry> <classpathentry kind="output" path="war/WEB-INF/classes"/> </classpath> Modified: incubator/ace/trunk/webui/build.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/webui/build.xml?rev=821409&r1=821408&r2=821409&view=diff ============================================================================== --- incubator/ace/trunk/webui/build.xml (original) +++ incubator/ace/trunk/webui/build.xml Sat Oct 3 20:47:50 2009 @@ -10,6 +10,7 @@ <path refid="bnd.classpath" /> <fileset dir="${gwt.sdk}" includes="gwt-dev*.jar"/> <!-- Add any additional non-server libs (such as JUnit) --> + <fileset dir="../webui/lib" includes="gwt-dnd-2.6.5.jar"/> <fileset dir="war/WEB-INF/lib" includes="**/*.jar"/> </path> Added: incubator/ace/trunk/webui/lib/gwt-dnd-2.6.5-javadoc.jar URL: http://svn.apache.org/viewvc/incubator/ace/trunk/webui/lib/gwt-dnd-2.6.5-javadoc.jar?rev=821409&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/ace/trunk/webui/lib/gwt-dnd-2.6.5-javadoc.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: incubator/ace/trunk/webui/lib/gwt-dnd-2.6.5.jar URL: http://svn.apache.org/viewvc/incubator/ace/trunk/webui/lib/gwt-dnd-2.6.5.jar?rev=821409&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/ace/trunk/webui/lib/gwt-dnd-2.6.5.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: incubator/ace/trunk/webui/src/org/apache/ace/client/BundleTable.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/webui/src/org/apache/ace/client/BundleTable.java?rev=821409&r1=821408&r2=821409&view=diff ============================================================================== --- incubator/ace/trunk/webui/src/org/apache/ace/client/BundleTable.java (original) +++ incubator/ace/trunk/webui/src/org/apache/ace/client/BundleTable.java Sat Oct 3 20:47:50 2009 @@ -19,10 +19,15 @@ package org.apache.ace.client; import org.apache.ace.client.Main.StatusHandler; +import org.apache.ace.client.services.AssociationService; +import org.apache.ace.client.services.AssociationServiceAsync; import org.apache.ace.client.services.BundleDescriptor; import org.apache.ace.client.services.BundleService; import org.apache.ace.client.services.BundleServiceAsync; +import org.apache.ace.client.services.Descriptor; +import org.apache.ace.client.services.GroupDescriptor; +import com.allen_sauer.gwt.dnd.client.PickupDragController; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -31,9 +36,10 @@ */ public class BundleTable extends ObjectTable<BundleDescriptor> { private BundleServiceAsync m_bundleService = GWT.create(BundleService.class); + private AssociationServiceAsync m_associationService = GWT.create(AssociationService.class); - BundleTable(StatusHandler handler, Main main) { - super(handler, main); + BundleTable(StatusHandler handler, PickupDragController dragController, Main main) { + super(handler, dragController, main); } @Override @@ -55,4 +61,11 @@ protected void remove(BundleDescriptor object, AsyncCallback<Void> callback) { m_bundleService.remove(object, callback); } + + @Override + protected void link(BundleDescriptor object, Descriptor other, AsyncCallback<Void> callback) { + if (other instanceof GroupDescriptor) { + m_associationService.link(object, (GroupDescriptor) other, callback); + } + } } Modified: incubator/ace/trunk/webui/src/org/apache/ace/client/GroupTable.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/webui/src/org/apache/ace/client/GroupTable.java?rev=821409&r1=821408&r2=821409&view=diff ============================================================================== --- incubator/ace/trunk/webui/src/org/apache/ace/client/GroupTable.java (original) +++ incubator/ace/trunk/webui/src/org/apache/ace/client/GroupTable.java Sat Oct 3 20:47:50 2009 @@ -19,10 +19,16 @@ package org.apache.ace.client; import org.apache.ace.client.Main.StatusHandler; +import org.apache.ace.client.services.AssociationService; +import org.apache.ace.client.services.AssociationServiceAsync; +import org.apache.ace.client.services.BundleDescriptor; +import org.apache.ace.client.services.Descriptor; import org.apache.ace.client.services.GroupDescriptor; import org.apache.ace.client.services.GroupService; import org.apache.ace.client.services.GroupServiceAsync; +import org.apache.ace.client.services.LicenseDescriptor; +import com.allen_sauer.gwt.dnd.client.PickupDragController; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -32,9 +38,10 @@ */ public class GroupTable extends ObjectTable<GroupDescriptor> { private GroupServiceAsync m_groupService = GWT.create(GroupService.class); + private AssociationServiceAsync m_associationService = GWT.create(AssociationService.class); - GroupTable(StatusHandler handler, Main main) { - super(handler, main); + GroupTable(StatusHandler handler, PickupDragController dragController, Main main) { + super(handler, dragController, main); } @Override @@ -71,4 +78,14 @@ m_groupService.remove(object, callback); } + @Override + protected void link(GroupDescriptor object, Descriptor other, AsyncCallback<Void> callback) { + if (other instanceof BundleDescriptor) { + m_associationService.link((BundleDescriptor) other, object, callback); + } + else if (other instanceof LicenseDescriptor) { + m_associationService.link(object, (LicenseDescriptor) other, callback); + } + } + } Modified: incubator/ace/trunk/webui/src/org/apache/ace/client/LicenseTable.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/webui/src/org/apache/ace/client/LicenseTable.java?rev=821409&r1=821408&r2=821409&view=diff ============================================================================== --- incubator/ace/trunk/webui/src/org/apache/ace/client/LicenseTable.java (original) +++ incubator/ace/trunk/webui/src/org/apache/ace/client/LicenseTable.java Sat Oct 3 20:47:50 2009 @@ -19,10 +19,16 @@ package org.apache.ace.client; import org.apache.ace.client.Main.StatusHandler; +import org.apache.ace.client.services.AssociationService; +import org.apache.ace.client.services.AssociationServiceAsync; +import org.apache.ace.client.services.Descriptor; +import org.apache.ace.client.services.GroupDescriptor; import org.apache.ace.client.services.LicenseDescriptor; import org.apache.ace.client.services.LicenseService; import org.apache.ace.client.services.LicenseServiceAsync; +import org.apache.ace.client.services.TargetDescriptor; +import com.allen_sauer.gwt.dnd.client.PickupDragController; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -32,9 +38,10 @@ */ public class LicenseTable extends ObjectTable<LicenseDescriptor> { private LicenseServiceAsync m_licenseService = GWT.create(LicenseService.class); + private AssociationServiceAsync m_associationService = GWT.create(AssociationService.class); - LicenseTable(StatusHandler handler, Main main) { - super(handler, main); + LicenseTable(StatusHandler handler, PickupDragController dragController, Main main) { + super(handler, dragController, main); } @Override @@ -70,4 +77,14 @@ protected void remove(LicenseDescriptor object, AsyncCallback<Void> callback) { m_licenseService.remove(object, callback); } -} + + @Override + protected void link(LicenseDescriptor object, Descriptor other, AsyncCallback<Void> callback) { + if (other instanceof GroupDescriptor) { + m_associationService.link((GroupDescriptor) other, object, callback); + } + else if (other instanceof TargetDescriptor) { + m_associationService.link(object, (TargetDescriptor) other, callback); + } + } +} \ No newline at end of file Modified: incubator/ace/trunk/webui/src/org/apache/ace/client/Main.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/webui/src/org/apache/ace/client/Main.java?rev=821409&r1=821408&r2=821409&view=diff ============================================================================== --- incubator/ace/trunk/webui/src/org/apache/ace/client/Main.java (original) +++ incubator/ace/trunk/webui/src/org/apache/ace/client/Main.java Sat Oct 3 20:47:50 2009 @@ -26,12 +26,11 @@ import org.apache.ace.client.services.AssociationService; import org.apache.ace.client.services.AssociationServiceAsync; import org.apache.ace.client.services.Descriptor; -import org.apache.ace.client.services.GroupDescriptor; -import org.apache.ace.client.services.LicenseDescriptor; import org.apache.ace.client.services.TargetDescriptor; import org.apache.ace.client.services.TargetService; import org.apache.ace.client.services.TargetServiceAsync; +import com.allen_sauer.gwt.dnd.client.PickupDragController; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.impl.StringBuilderImpl; @@ -53,13 +52,15 @@ public class Main implements EntryPoint { private static final int REFRESH_INTERVAL = 2000; private StatusLabel m_statusLabel = new StatusLabel(); - private BundleTable m_bundleTable = new BundleTable(m_statusLabel, this); - private GroupTable m_groupTable = new GroupTable(m_statusLabel, this); - private LicenseTable m_licenseTable = new LicenseTable(m_statusLabel, this); - private TargetTable m_targetTable = new TargetTable(m_statusLabel, this); + private PickupDragController m_dragController = new PickupDragController(RootPanel.get(), false); + private BundleTable m_bundleTable = new BundleTable(m_statusLabel, m_dragController, this); + private GroupTable m_groupTable = new GroupTable(m_statusLabel, m_dragController, this); + private LicenseTable m_licenseTable = new LicenseTable(m_statusLabel, m_dragController, this); + private TargetTable m_targetTable = new TargetTable(m_statusLabel, m_dragController, this); AssociationServiceAsync m_assocationService = GWT.create(AssociationService.class); + /** * Interface for the columns, that they can use to indicate their status of * communication with the server. @@ -139,50 +140,6 @@ // targetScrollPanel.setHeight("30em"); targetScrollPanel.setStyleName("objectTable"); - // Create the association buttons - Button b2g = new Button("<->"); - b2g.addClickHandler(new ClickHandler() { - public void onClick(ClickEvent event) { - m_assocationService.link(m_bundleTable.getCheckedObject(), m_groupTable.getCheckedObject(), new AsyncCallback<Void>() { - public void onFailure(Throwable caught) { - Window.alert("Error creating association: " + caught); - } - public void onSuccess(Void result) { - updateHighlight(); - } - }); - } - }); - - Button g2l = new Button("<->"); - g2l.addClickHandler(new ClickHandler() { - public void onClick(ClickEvent event) { - GroupDescriptor group = m_groupTable.getCheckedObject(); - LicenseDescriptor license = m_licenseTable.getCheckedObject(); - m_assocationService.link(group, license, new AsyncCallback<Void>() { - public void onFailure(Throwable caught) { - Window.alert("Error creating association: " + caught); - } - public void onSuccess(Void result) { - updateHighlight(); - } - }); - } - }); - Button l2t = new Button("<->"); - l2t.addClickHandler(new ClickHandler() { - public void onClick(ClickEvent event) { - m_assocationService.link(m_licenseTable.getCheckedObject(), m_targetTable.getCheckedObject(), new AsyncCallback<Void>() { - public void onFailure(Throwable caught) { - Window.alert("Error creating association: " + caught); - } - public void onSuccess(Void result) { - updateHighlight(); - } - }); - } - }); - FlexTable rootPanel = new FlexTable(); FlexCellFormatter formatter = rootPanel.getFlexCellFormatter(); rootPanel.setWidth("100%"); @@ -190,30 +147,27 @@ rootPanel.setHTML(1, 0, "Bundle"); formatter.setWidth(1, 0, "25%"); rootPanel.setWidget(2, 0, addBundleButton); - rootPanel.setWidget(2, 1, b2g); - formatter.setStyleName(2, 1, "fixedColumn"); rootPanel.setWidget(3, 0, bundleScrollPanel); formatter.setHeight(3, 0, "90%"); - rootPanel.setHTML(1, 2, "Group"); + rootPanel.setHTML(1, 1, "Group"); + formatter.setWidth(1, 1, "25%"); + rootPanel.setWidget(2, 1, addGroupButton); + rootPanel.setWidget(3, 1, groupScrollPanel); + rootPanel.setHTML(1, 2, "License"); formatter.setWidth(1, 2, "25%"); - rootPanel.setWidget(2, 2, addGroupButton); - rootPanel.setWidget(2, 3, g2l); - formatter.setStyleName(2, 3, "fixedColumn"); - rootPanel.setWidget(3, 2, groupScrollPanel); - rootPanel.setHTML(1, 4, "License"); - formatter.setWidth(1, 4, "25%"); - rootPanel.setWidget(2, 4, addLicenseButton); - rootPanel.setWidget(2, 5, l2t); - formatter.setStyleName(2, 5, "fixedColumn"); - rootPanel.setWidget(3, 4, licenseScrollPanel); - rootPanel.setHTML(1, 6, "Target"); - formatter.setWidth(1, 6, "25%"); - rootPanel.setWidget(3, 6, targetScrollPanel); + rootPanel.setWidget(2, 2, addLicenseButton); + rootPanel.setWidget(3, 2, licenseScrollPanel); + rootPanel.setHTML(1, 3, "Target"); + formatter.setWidth(1, 3, "25%"); + rootPanel.setWidget(3, 3, targetScrollPanel); rootPanel.setWidget(0, 0, new CheckoutPanel(this)); - formatter.setColSpan(0, 0, 7); + formatter.setColSpan(0, 0, 4); rootPanel.setWidget(4, 0, m_statusLabel); - formatter.setColSpan(4, 0, 7); + formatter.setColSpan(4, 0, 4); RootPanel.get("body").add(rootPanel); + + m_dragController.setBehaviorDragProxy(true); + m_dragController.setBehaviorDragStartSensitivity(4); } /** Modified: incubator/ace/trunk/webui/src/org/apache/ace/client/ObjectTable.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/webui/src/org/apache/ace/client/ObjectTable.java?rev=821409&r1=821408&r2=821409&view=diff ============================================================================== --- incubator/ace/trunk/webui/src/org/apache/ace/client/ObjectTable.java (original) +++ incubator/ace/trunk/webui/src/org/apache/ace/client/ObjectTable.java Sat Oct 3 20:47:50 2009 @@ -27,22 +27,27 @@ import org.apache.ace.client.services.AssociationServiceAsync; import org.apache.ace.client.services.Descriptor; +import com.allen_sauer.gwt.dnd.client.DragContext; +import com.allen_sauer.gwt.dnd.client.PickupDragController; +import com.allen_sauer.gwt.dnd.client.drop.DropController; +import com.allen_sauer.gwt.dnd.client.drop.SimpleDropController; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Button; -import com.google.gwt.user.client.ui.CheckBox; import com.google.gwt.user.client.ui.DockPanel; import com.google.gwt.user.client.ui.FlexTable; import com.google.gwt.user.client.ui.FocusPanel; +import com.google.gwt.user.client.ui.Label; /** * Basic table for using a valueobject per row. */ public abstract class ObjectTable<T extends Descriptor> extends FlexTable { private final StatusHandler m_handler; + private final PickupDragController m_dragController; private final Main m_main; private final Map<T, ObjectPanel> m_panels = new HashMap<T, ObjectPanel>(); @@ -64,7 +69,6 @@ ObjectPanel panel = m_panels.get(t); if (panel == null) { panel = new ObjectPanel(t); - panel.addToGroup(m_buttonGroup); m_panels.put(t, panel); } panel.setText(getText(t)); @@ -82,24 +86,11 @@ }; /** - * Deselects all other checkboxes in the same group when one gets clicked; - * this way, we end up with a single selected button. - */ - private final ClickHandler m_buttonGroup = new ClickHandler() { - public void onClick(ClickEvent event) { - for (ObjectPanel w : m_panels.values()) { - if (!w.owns(event.getSource())) { - w.setChecked(false); - } - } - } - }; - - /** * Sole constructor for this class; all subclasses must delegate to this one. */ - public ObjectTable(StatusHandler handler, Main main) { + public ObjectTable(StatusHandler handler, PickupDragController dragController, Main main) { m_handler = handler; + m_dragController = dragController; m_main = main; } @@ -127,23 +118,15 @@ protected abstract void remove(T object, AsyncCallback<Void> callback); /** - * States whether removal of this object is allowed. + * Links an object of ours with some other, that has been dropped onto our object. */ - protected boolean canDelete() { - return true; - } + protected abstract void link(T object, Descriptor other, AsyncCallback<Void> callback); - /** - * Finds the currently checked object, or <code>null</code> if none is found. + * States whether removal of this object is allowed. */ - public T getCheckedObject() { - for (Map.Entry<T, ObjectPanel> entry : m_panels.entrySet()) { - if (entry.getValue().isChecked()) { - return entry.getKey(); - } - } - return null; + protected boolean canDelete() { + return true; } /** @@ -195,15 +178,17 @@ * unlink and delete the related object. */ private class ObjectPanel extends FocusPanel { - private final CheckBox m_checkbox; + private final Label m_label; private boolean m_selected; + private final T m_object; public ObjectPanel(final T object) { + m_object = object; DockPanel mainPanel = new DockPanel(); - m_checkbox = new CheckBox(getText(object)); - m_checkbox.setStylePrimaryName("objectpaneltext"); - mainPanel.add(m_checkbox, DockPanel.WEST); + m_label = new Label(getText(object)); + m_label.setStylePrimaryName("objectpaneltext"); + mainPanel.add(m_label, DockPanel.WEST); if (canDelete()) { Button delete = new Button("x"); @@ -235,7 +220,6 @@ public void onSuccess(Void result) { m_main.updateHighlight(); } - }); event.stopPropagation(); // we don't want the panel to get the click } @@ -252,14 +236,30 @@ m_main.updateHighlight(); } }); + + m_dragController.makeDraggable(this); + DropController dropController = new SimpleDropController(this) { + @Override + public void onDrop(DragContext context) { + Object other = ((ObjectPanel) context.draggable).getObject(); + if (other instanceof Descriptor) { + link(object, (Descriptor) other, new AsyncCallback<Void>() { + public void onFailure(Throwable caught) { + Window.alert("Error linking objects."); + } + public void onSuccess(Void result) { + // Hurrah! + m_main.updateHighlight(); + } + }); + } + } + }; + m_dragController.registerDropController(dropController); } - public boolean isChecked() { - return m_checkbox.getValue(); - } - - public void setChecked(boolean b) { - m_checkbox.setValue(b); + public T getObject() { + return m_object; } public boolean isSelected() { @@ -270,40 +270,16 @@ m_selected = selected; if (selected) { addStyleDependentName("selected"); - m_checkbox.addStyleDependentName("selected"); + m_label.addStyleDependentName("selected"); } else { removeStyleDependentName("selected"); - m_checkbox.removeStyleDependentName("selected"); + m_label.removeStyleDependentName("selected"); } } - public void setRelated(boolean related) { - if (related) { - addStyleDependentName("related"); - } - else { - removeStyleDependentName("related"); - } - } - public void setText(String text) { - m_checkbox.setText(text); - } - - /** - * Returns whether the given object is 'owned' by this panel. - */ - public boolean owns(Object object) { - return object.equals(m_checkbox); - } - - /** - * Registers a clickhandler with the checkbox; this is used to make sure that at most one - * checkbox in a column is checked. - */ - public void addToGroup(ClickHandler handler) { - m_checkbox.addClickHandler(handler); + m_label.setText(text); } } } Modified: incubator/ace/trunk/webui/src/org/apache/ace/client/TargetTable.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/webui/src/org/apache/ace/client/TargetTable.java?rev=821409&r1=821408&r2=821409&view=diff ============================================================================== --- incubator/ace/trunk/webui/src/org/apache/ace/client/TargetTable.java (original) +++ incubator/ace/trunk/webui/src/org/apache/ace/client/TargetTable.java Sat Oct 3 20:47:50 2009 @@ -19,10 +19,15 @@ package org.apache.ace.client; import org.apache.ace.client.Main.StatusHandler; +import org.apache.ace.client.services.AssociationService; +import org.apache.ace.client.services.AssociationServiceAsync; +import org.apache.ace.client.services.Descriptor; +import org.apache.ace.client.services.LicenseDescriptor; import org.apache.ace.client.services.TargetDescriptor; import org.apache.ace.client.services.TargetService; import org.apache.ace.client.services.TargetServiceAsync; +import com.allen_sauer.gwt.dnd.client.PickupDragController; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -31,9 +36,10 @@ */ public class TargetTable extends ObjectTable<TargetDescriptor> { private TargetServiceAsync m_targetService = GWT.create(TargetService.class); + private AssociationServiceAsync m_associationService = GWT.create(AssociationService.class); - TargetTable(StatusHandler handler, Main main) { - super(handler, main); + TargetTable(StatusHandler handler, PickupDragController dragController, Main main) { + super(handler, dragController, main); } @Override @@ -60,4 +66,11 @@ protected boolean canDelete() { return false; } + + @Override + protected void link(TargetDescriptor object, Descriptor other, AsyncCallback<Void> callback) { + if (other instanceof LicenseDescriptor) { + m_associationService.link((LicenseDescriptor) other, object, callback); + } + } } Modified: incubator/ace/trunk/webui/src/org/apache/ace/webui.gwt.xml URL: http://svn.apache.org/viewvc/incubator/ace/trunk/webui/src/org/apache/ace/webui.gwt.xml?rev=821409&r1=821408&r2=821409&view=diff ============================================================================== --- incubator/ace/trunk/webui/src/org/apache/ace/webui.gwt.xml (original) +++ incubator/ace/trunk/webui/src/org/apache/ace/webui.gwt.xml Sat Oct 3 20:47:50 2009 @@ -12,7 +12,8 @@ <!-- <inherits name='com.google.gwt.user.theme.dark.Dark'/> --> <!-- Other module inherits --> - + <inherits name='com.allen_sauer.gwt.dnd.gwt-dnd'/> + <!-- Specify the app entry point class. --> <entry-point class='org.apache.ace.client.Main'/> </module> From ace-commits-returnaaron59@example.net Sat Oct 03 20:54:15 2009 Return-Path: <ace-commits-returnaaron59@example.net> Delivered-To: aaron59@example.net Received: (qmail 9218 invoked from network); 3 Oct 2009 20:54:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Oct 2009 20:54:15 -0000 Received: (qmail 94891 invoked by uid 500); 3 Oct 2009 20:54:15 -0000 Delivered-To: aaron59@example.net Received: (qmail 94871 invoked by uid 500); 3 Oct 2009 20:54:15 -0000 Mailing-List: contact aaron59@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:aaron59@example.net> List-Unsubscribe: <mailto:aaron59@example.net> List-Post: <mailto:aaron59@example.net> List-Id: <ace-commits.incubator.apache.org> Reply-To: aaron59@example.net Delivered-To: mailing list aaron59@example.net Received: (qmail 94859 invoked by uid 99); 3 Oct 2009 20:54:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Oct 2009 20:54:15 +0000 X-ASF-Spam-Status: No, hits=3.4 required=10.0 tests=HTML_MESSAGE,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [83.161.120.155] (HELO mail.atlassian.com) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Oct 2009 20:54:04 +0000 Received: from atlassian13.managed.contegix.com (atlassian13.private [83.161.120.155]) by mail.atlassian.com (Postfix) with ESMTP id 619EC16301D7 for <aaron59@example.net>; Sat, 3 Oct 2009 15:53:43 -0500 (CDT) Received: from atlassian13.managed.contegix.com (atlassian13.managed.contegix.com [83.161.120.155]) by atlassian13.managed.contegix.com (Postfix) with ESMTP id 504A365B0465 for <aaron59@example.net>; Sat, 3 Oct 2009 15:53:40 -0500 (CDT) Date: Sat, 3 Oct 2009 15:53:40 -0500 (CDT) From: Atlassian Open Source Bamboo <aaron59@example.net> To: aaron59@example.net Message-ID: <32728580.aaron59@example.net> Subject: [OSS Bamboo] Apache ACE - Default build 39 has FAILED (12 tests failed, no failures were new). Change made by Angelo van der Sijpt MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_Part_391_9415095.1254603220255" X-Virus-Checked: Checked by ClamAV on apache.org ------=_Part_391_9415095.1254603220255 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline ------=_Part_391_9415095.1254603220255 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit ----------------------------------------------------------- ACE-DEF-39 failed. ----------------------------------------------------------- Code has been updated by Angelo van der Sijpt. 12/159 tests failed. http://opensource.bamboo.atlassian.com/browse/ACE-DEF-39/ -------------- Code Changes -------------- Angelo van der Sijpt (821409): >ACE-41 Added an initial version of using drag-and-drop for creating associations. This also means the checkboxes and the '<->' buttons are gone. -------------- Tests -------------- Failed Tests (12) - LogIntegrationTest: Run tests (Existing) - FailTests: Fail (Existing) - ServletConfiguratorIntegrationTest: Register servlet (Existing) - ServletConfiguratorIntegrationTest: Servlet on two http services (Existing) - ServletConfiguratorIntegrationTest: Start http service (Existing) - RepositoryTest: Bad requests (Existing) - RepositoryTest: Checkout and commit (Existing) - RepositoryTest: Creation (Existing) - RepositoryTest: Get and put (Existing) - RepositoryTest: Initial content (Existing) - RepositoryTest: Master (Existing) - ConfiguratorTest: Configurator test (Existing) -------------- Error Summary -------------- Failed to parse test result file &quot;coverage.xml&quot; -- This message is automatically generated by Atlassian Bamboo ------=_Part_391_9415095.1254603220255-- From ace-commits-returnaaron59@example.net Sat Oct 03 21:45:59 2009 Return-Path: <ace-commits-returnaaron59@example.net> Delivered-To: aaron59@example.net Received: (qmail 24532 invoked from network); 3 Oct 2009 21:45:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Oct 2009 21:45:59 -0000 Received: (qmail 43116 invoked by uid 500); 3 Oct 2009 21:45:59 -0000 Delivered-To: aaron59@example.net Received: (qmail 43097 invoked by uid 500); 3 Oct 2009 21:45:58 -0000 Mailing-List: contact aaron59@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:aaron59@example.net> List-Unsubscribe: <mailto:aaron59@example.net> List-Post: <mailto:aaron59@example.net> List-Id: <ace-commits.incubator.apache.org> Reply-To: aaron59@example.net Delivered-To: mailing list aaron59@example.net Received: (qmail 43087 invoked by uid 99); 3 Oct 2009 21:45:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Oct 2009 21:45:58 +0000 X-ASF-Spam-Status: No, hits=3.4 required=10.0 tests=HTML_MESSAGE,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [83.161.120.155] (HELO mail.atlassian.com) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Oct 2009 21:45:47 +0000 Received: from atlassian13.managed.contegix.com (atlassian13.private [83.161.120.155]) by mail.atlassian.com (Postfix) with ESMTP id 96A1A16300F6 for <aaron59@example.net>; Sat, 3 Oct 2009 16:45:26 -0500 (CDT) Received: from atlassian13.managed.contegix.com (atlassian13.managed.contegix.com [83.161.120.155]) by atlassian13.managed.contegix.com (Postfix) with ESMTP id C9FAF65B0465 for <aaron59@example.net>; Sat, 3 Oct 2009 16:45:23 -0500 (CDT) Date: Sat, 3 Oct 2009 16:45:23 -0500 (CDT) From: Atlassian Open Source Bamboo <aaron59@example.net> To: aaron59@example.net Message-ID: <17614574.aaron59@example.net> Subject: [OSS Bamboo] Apache ACE - Default build 40 has FAILED (12 tests failed, no failures were new). Change made by Angelo van der Sijpt MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_Part_397_3484826.1254606323758" X-Virus-Checked: Checked by ClamAV on apache.org ------=_Part_397_3484826.1254606323758 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline ------=_Part_397_3484826.1254606323758 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit ----------------------------------------------------------- ACE-DEF-40 failed. ----------------------------------------------------------- Code has been updated by Angelo van der Sijpt. 12/159 tests failed. http://opensource.bamboo.atlassian.com/browse/ACE-DEF-40/ -------------- Code Changes -------------- Angelo van der Sijpt (821424): >ACE-41 Now we don't have a selection per se when creating associations, we introduced the opportunity for an NPE when updating highlights; introduced a null check for that. -------------- Tests -------------- Failed Tests (12) - LogIntegrationTest: Run tests (Existing) - FailTests: Fail (Existing) - ServletConfiguratorIntegrationTest: Register servlet (Existing) - ServletConfiguratorIntegrationTest: Servlet on two http services (Existing) - ServletConfiguratorIntegrationTest: Start http service (Existing) - RepositoryTest: Bad requests (Existing) - RepositoryTest: Checkout and commit (Existing) - RepositoryTest: Creation (Existing) - RepositoryTest: Get and put (Existing) - RepositoryTest: Initial content (Existing) - RepositoryTest: Master (Existing) - ConfiguratorTest: Configurator test (Existing) -------------- Error Summary -------------- Failed to parse test result file &quot;coverage.xml&quot; -- This message is automatically generated by Atlassian Bamboo ------=_Part_397_3484826.1254606323758-- From ace-commits-returnaaron59@example.net Sat Oct 03 21:50:32 2009 Return-Path: <ace-commits-returnaaron59@example.net> Delivered-To: aaron59@example.net Received: (qmail 25638 invoked from network); 3 Oct 2009 21:50:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Oct 2009 21:50:32 -0000 Received: (qmail 46989 invoked by uid 500); 3 Oct 2009 21:50:32 -0000 Delivered-To: aaron59@example.net Received: (qmail 46971 invoked by uid 500); 3 Oct 2009 21:50:32 -0000 Mailing-List: contact aaron59@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:aaron59@example.net> List-Unsubscribe: <mailto:aaron59@example.net> List-Post: <mailto:aaron59@example.net> List-Id: <ace-commits.incubator.apache.org> Reply-To: aaron59@example.net Delivered-To: mailing list aaron59@example.net Received: (qmail 46951 invoked by uid 99); 3 Oct 2009 21:50:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Oct 2009 21:50:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Oct 2009 21:41:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9229C2388853; Sat, 3 Oct 2009 21:41:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r821424 - /incubator/ace/trunk/webui/src/org/apache/ace/client/Main.java Date: Sat, 03 Oct 2009 21:41:10 -0000 To: aaron59@example.net From: aaron59@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <aaron59@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: angelos Date: Sat Oct 3 21:41:10 2009 New Revision: 821424 URL: http://svn.apache.org/viewvc?rev=821424&view=rev Log: ACE-41 Now we don't have a selection per se when creating associations, we introduced the opportunity for an NPE when updating highlights; introduced a null check for that. Modified: incubator/ace/trunk/webui/src/org/apache/ace/client/Main.java Modified: incubator/ace/trunk/webui/src/org/apache/ace/client/Main.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/webui/src/org/apache/ace/client/Main.java?rev=821424&r1=821423&r2=821424&view=diff ============================================================================== --- incubator/ace/trunk/webui/src/org/apache/ace/client/Main.java (original) +++ incubator/ace/trunk/webui/src/org/apache/ace/client/Main.java Sat Oct 3 21:41:10 2009 @@ -19,6 +19,7 @@ package org.apache.ace.client; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -184,15 +185,22 @@ * Triggers the updating of the highlight */ void updateHighlight() { - m_assocationService.getRelated(getSelectedObject(), new AsyncCallback<Descriptor[]>() { - public void onFailure(Throwable caught) { - // Too bad... - Window.alert("Error updating highlights: " + caught); - } - public void onSuccess(Descriptor[] result) { - highlight(Arrays.asList(result)); - } - }); + Descriptor selected = getSelectedObject(); + if (selected == null) { + List<Descriptor> emptyList = Collections.emptyList(); + highlight(emptyList); + } + else { + m_assocationService.getRelated(selected, new AsyncCallback<Descriptor[]>() { + public void onFailure(Throwable caught) { + // Too bad... + Window.alert("Error updating highlights: " + caught); + } + public void onSuccess(Descriptor[] result) { + highlight(Arrays.asList(result)); + } + }); + } } /** From ace-commits-returnaaron59@example.net Sun Oct 04 13:53:05 2009 Return-Path: <ace-commits-returnaaron59@example.net> Delivered-To: aaron59@example.net Received: (qmail 92913 invoked from network); 4 Oct 2009 13:53:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Oct 2009 13:53:05 -0000 Received: (qmail 21870 invoked by uid 500); 4 Oct 2009 13:53:05 -0000 Delivered-To: aaron59@example.net Received: (qmail 21852 invoked by uid 500); 4 Oct 2009 13:53:05 -0000 Mailing-List: contact aaron59@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:aaron59@example.net> List-Unsubscribe: <mailto:aaron59@example.net> List-Post: <mailto:aaron59@example.net> List-Id: <ace-commits.incubator.apache.org> Reply-To: aaron59@example.net Delivered-To: mailing list aaron59@example.net Received: (qmail 21842 invoked by uid 99); 4 Oct 2009 13:53:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Oct 2009 13:53:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Oct 2009 13:53:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3CF1B2388882; Sun, 4 Oct 2009 13:52:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r821541 - /incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/ConfiguratorTest.java Date: Sun, 04 Oct 2009 13:52:11 -0000 To: aaron59@example.net From: aaron59@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <aaron59@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: marrs Date: Sun Oct 4 13:52:10 2009 New Revision: 821541 URL: http://svn.apache.org/viewvc?rev=821541&view=rev Log: Extended a timeout and added a check when committing test data in an attempt to see if this test fails on the server purely because of timing. Modified: incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/ConfiguratorTest.java Modified: incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/ConfiguratorTest.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/ConfiguratorTest.java?rev=821541&r1=821540&r2=821541&view=diff ============================================================================== --- incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/ConfiguratorTest.java (original) +++ incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/ConfiguratorTest.java Sun Oct 4 13:52:10 2009 @@ -70,17 +70,17 @@ " </user>" + "</roles>").getBytes()); - m_repository.commit(bis, m_repository.getRange().getHigh()); + assert m_repository.commit(bis, m_repository.getRange().getHigh()) : "Committing test user data failed."; User user = (User) m_userAdmin.getRole("TestUser"); int count = 0; - while ((user == null) && (count < 16)) { + while ((user == null) && (count < 60)) { Thread.sleep(250); user = (User) m_userAdmin.getRole("TestUser"); count++; } if (user == null) { - assert false : "Even after four seconds, our user is not present."; + assert false : "Even after fifteen seconds, our user is not present."; } boolean foundPassword = false; From ace-commits-returnaaron59@example.net Sun Oct 04 13:58:51 2009 Return-Path: <ace-commits-returnaaron59@example.net> Delivered-To: aaron59@example.net Received: (qmail 93767 invoked from network); 4 Oct 2009 13:58:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Oct 2009 13:58:51 -0000 Received: (qmail 27784 invoked by uid 500); 4 Oct 2009 13:58:51 -0000 Delivered-To: aaron59@example.net Received: (qmail 27764 invoked by uid 500); 4 Oct 2009 13:58:51 -0000 Mailing-List: contact aaron59@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:aaron59@example.net> List-Unsubscribe: <mailto:aaron59@example.net> List-Post: <mailto:aaron59@example.net> List-Id: <ace-commits.incubator.apache.org> Reply-To: aaron59@example.net Delivered-To: mailing list aaron59@example.net Received: (qmail 27754 invoked by uid 99); 4 Oct 2009 13:58:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Oct 2009 13:58:51 +0000 X-ASF-Spam-Status: No, hits=3.4 required=10.0 tests=HTML_MESSAGE,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [83.161.120.155] (HELO mail.atlassian.com) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Oct 2009 13:58:40 +0000 Received: from atlassian13.managed.contegix.com (atlassian13.private [83.161.120.155]) by mail.atlassian.com (Postfix) with ESMTP id 464A71630121 for <aaron59@example.net>; Sun, 4 Oct 2009 08:58:19 -0500 (CDT) Received: from atlassian13.managed.contegix.com (atlassian13.managed.contegix.com [83.161.120.155]) by atlassian13.managed.contegix.com (Postfix) with ESMTP id EFC8265B0459 for <aaron59@example.net>; Sun, 4 Oct 2009 08:58:16 -0500 (CDT) Date: Sun, 4 Oct 2009 08:58:16 -0500 (CDT) From: Atlassian Open Source Bamboo <aaron59@example.net> To: aaron59@example.net Message-ID: <2760972.aaron59@example.net> Subject: [OSS Bamboo] Apache ACE - Default build 41 has FAILED (12 tests failed, no failures were new). Change made by Marcel Offermans MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_Part_419_16231424.1254664696912" X-Virus-Checked: Checked by ClamAV on apache.org ------=_Part_419_16231424.1254664696912 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline ------=_Part_419_16231424.1254664696912 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit ----------------------------------------------------------- ACE-DEF-41 failed. ----------------------------------------------------------- Code has been updated by Marcel Offermans. 12/159 tests failed. http://opensource.bamboo.atlassian.com/browse/ACE-DEF-41/ -------------- Code Changes -------------- Marcel Offermans (821541): >Extended a timeout and added a check when committing test data in an attempt to see if this test fails on the server purely because of timing. -------------- Tests -------------- Failed Tests (12) - LogIntegrationTest: Run tests (Existing) - FailTests: Fail (Existing) - ServletConfiguratorIntegrationTest: Register servlet (Existing) - ServletConfiguratorIntegrationTest: Servlet on two http services (Existing) - ServletConfiguratorIntegrationTest: Start http service (Existing) - RepositoryTest: Bad requests (Existing) - RepositoryTest: Checkout and commit (Existing) - RepositoryTest: Creation (Existing) - RepositoryTest: Get and put (Existing) - RepositoryTest: Initial content (Existing) - RepositoryTest: Master (Existing) - ConfiguratorTest: Configurator test (Existing) -------------- Error Summary -------------- Failed to parse test result file &quot;coverage.xml&quot; -- This message is automatically generated by Atlassian Bamboo ------=_Part_419_16231424.1254664696912-- From ace-commits-returnaaron59@example.net Sun Oct 04 18:36:53 2009 Return-Path: <ace-commits-returnaaron59@example.net> Delivered-To: aaron59@example.net Received: (qmail 38074 invoked from network); 4 Oct 2009 18:36:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Oct 2009 18:36:53 -0000 Received: (qmail 10522 invoked by uid 500); 4 Oct 2009 18:36:52 -0000 Delivered-To: aaron59@example.net Received: (qmail 10502 invoked by uid 500); 4 Oct 2009 18:36:52 -0000 Mailing-List: contact aaron59@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:aaron59@example.net> List-Unsubscribe: <mailto:aaron59@example.net> List-Post: <mailto:aaron59@example.net> List-Id: <ace-commits.incubator.apache.org> Reply-To: aaron59@example.net Delivered-To: mailing list aaron59@example.net Received: (qmail 10492 invoked by uid 99); 4 Oct 2009 18:36:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Oct 2009 18:36:52 +0000 X-ASF-Spam-Status: No, hits=-1998.5 required=10.0 tests=ALL_TRUSTED,WEIRD_PORT X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Oct 2009 18:36:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5D10123888C2; Sun, 4 Oct 2009 18:36:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r821572 - in /incubator/ace/trunk/core: conf/test/org.apache.ace.discovery.property.cfg lib/felix/1.8.1/conf/test-config.properties Date: Sun, 04 Oct 2009 18:36:20 -0000 To: aaron59@example.net From: aaron59@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <aaron59@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: marrs Date: Sun Oct 4 18:36:20 2009 New Revision: 821572 URL: http://svn.apache.org/viewvc?rev=821572&view=rev Log: Changed the webserver port for testing to 9000. Modified: incubator/ace/trunk/core/conf/test/org.apache.ace.discovery.property.cfg incubator/ace/trunk/core/lib/felix/1.8.1/conf/test-config.properties Modified: incubator/ace/trunk/core/conf/test/org.apache.ace.discovery.property.cfg URL: http://svn.apache.org/viewvc/incubator/ace/trunk/core/conf/test/org.apache.ace.discovery.property.cfg?rev=821572&r1=821571&r2=821572&view=diff ============================================================================== --- incubator/ace/trunk/core/conf/test/org.apache.ace.discovery.property.cfg (original) +++ incubator/ace/trunk/core/conf/test/org.apache.ace.discovery.property.cfg Sun Oct 4 18:36:20 2009 @@ -1 +1 @@ -serverURL = http://localhost:8080 \ No newline at end of file +serverURL = http://localhost:9000 \ No newline at end of file Modified: incubator/ace/trunk/core/lib/felix/1.8.1/conf/test-config.properties URL: http://svn.apache.org/viewvc/incubator/ace/trunk/core/lib/felix/1.8.1/conf/test-config.properties?rev=821572&r1=821571&r2=821572&view=diff ============================================================================== --- incubator/ace/trunk/core/lib/felix/1.8.1/conf/test-config.properties (original) +++ incubator/ace/trunk/core/lib/felix/1.8.1/conf/test-config.properties Sun Oct 4 18:36:20 2009 @@ -32,7 +32,7 @@ # Bundle config properties. # -org.osgi.service.http.port=8080 +org.osgi.service.http.port=9000 #obr.shell.telnet=on #obr.repository.url=http://bundles.osgi.org/obr/browse?_xml=1&cmd=repository From ace-commits-returnaaron59@example.net Sun Oct 04 18:38:22 2009 Return-Path: <ace-commits-returnaaron59@example.net> Delivered-To: aaron59@example.net Received: (qmail 38202 invoked from network); 4 Oct 2009 18:38:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Oct 2009 18:38:21 -0000 Received: (qmail 11647 invoked by uid 500); 4 Oct 2009 18:38:21 -0000 Delivered-To: aaron59@example.net Received: (qmail 11630 invoked by uid 500); 4 Oct 2009 18:38:21 -0000 Mailing-List: contact aaron59@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:aaron59@example.net> List-Unsubscribe: <mailto:aaron59@example.net> List-Post: <mailto:aaron59@example.net> List-Id: <ace-commits.incubator.apache.org> Reply-To: aaron59@example.net Delivered-To: mailing list aaron59@example.net Received: (qmail 11620 invoked by uid 99); 4 Oct 2009 18:38:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Oct 2009 18:38:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED,NORMAL_HTTP_TO_IP X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Oct 2009 18:38:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4AF2923888C2; Sun, 4 Oct 2009 18:37:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r821573 - in /incubator/ace/trunk/test/src/org/apache/ace: deployment/streamgenerator/impl/ discovery/property/ discovery/upnp/ obr/servlet/ test/constants/ test/deployment/ test/http/listener/ test/log/ test/repository/ test/repositoryadmi... Date: Sun, 04 Oct 2009 18:37:47 -0000 To: aaron59@example.net From: aaron59@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <aaron59@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: marrs Date: Sun Oct 4 18:37:46 2009 New Revision: 821573 URL: http://svn.apache.org/viewvc?rev=821573&view=rev Log: Extracted the webserver port from all test classes into a TestConstants class. Set its value to 9000. Added: incubator/ace/trunk/test/src/org/apache/ace/test/constants/ incubator/ace/trunk/test/src/org/apache/ace/test/constants/TestConstants.java Modified: incubator/ace/trunk/test/src/org/apache/ace/deployment/streamgenerator/impl/StreamTest.java incubator/ace/trunk/test/src/org/apache/ace/discovery/property/SimpleDiscoveryTest.java incubator/ace/trunk/test/src/org/apache/ace/discovery/upnp/SimpleDiscoveryTest.java incubator/ace/trunk/test/src/org/apache/ace/obr/servlet/BundleServletTest.java incubator/ace/trunk/test/src/org/apache/ace/test/deployment/DeploymentIntegrationTest.java incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/ServletConfiguratorIntegrationTest.java incubator/ace/trunk/test/src/org/apache/ace/test/log/Activator.java incubator/ace/trunk/test/src/org/apache/ace/test/log/LogIntegrationTest.java incubator/ace/trunk/test/src/org/apache/ace/test/repository/RepositoryTest.java incubator/ace/trunk/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java incubator/ace/trunk/test/src/org/apache/ace/test/tools/RepositoryTool.java incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/Activator.java Modified: incubator/ace/trunk/test/src/org/apache/ace/deployment/streamgenerator/impl/StreamTest.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/deployment/streamgenerator/impl/StreamTest.java?rev=821573&r1=821572&r2=821573&view=diff ============================================================================== --- incubator/ace/trunk/test/src/org/apache/ace/deployment/streamgenerator/impl/StreamTest.java (original) +++ incubator/ace/trunk/test/src/org/apache/ace/deployment/streamgenerator/impl/StreamTest.java Sun Oct 4 18:37:46 2009 @@ -34,6 +34,7 @@ import java.util.jar.Manifest; import org.apache.ace.deployment.provider.DeploymentProvider; +import org.apache.ace.test.constants.TestConstants; import org.apache.ace.test.utils.TestUtils; import org.apache.ace.test.utils.deployment.TestProvider; import org.osgi.service.log.LogService; @@ -69,7 +70,7 @@ for (int i = 1; i <= 250; i++) { final String id = "gateway-" + i; try { - streams[i - 1] = new URL("http://83.161.120.155:8080/data/" + id + "/versions/1.0.0").openStream(); + streams[i - 1] = new URL("http://83.161.120.155:" + TestConstants.PORT + "/data/" + id + "/versions/1.0.0").openStream(); } catch (IOException ex) { ex.printStackTrace(); @@ -188,7 +189,7 @@ for (int i = 250; i < 300; i++) { try { if (streams[i] == null) { - streams[i] = new URL("http://83.161.120.155:8080/data/gateway-" + (i + 1) + "/versions/1.0.0").openStream(); + streams[i] = new URL("http://83.161.120.155:" + TestConstants.PORT + "/data/gateway-" + (i + 1) + "/versions/1.0.0").openStream(); } int in = streams[i].read(); if (in == -1) { Modified: incubator/ace/trunk/test/src/org/apache/ace/discovery/property/SimpleDiscoveryTest.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/discovery/property/SimpleDiscoveryTest.java?rev=821573&r1=821572&r2=821573&view=diff ============================================================================== --- incubator/ace/trunk/test/src/org/apache/ace/discovery/property/SimpleDiscoveryTest.java (original) +++ incubator/ace/trunk/test/src/org/apache/ace/discovery/property/SimpleDiscoveryTest.java Sun Oct 4 18:37:46 2009 @@ -25,6 +25,7 @@ import java.util.Hashtable; import org.apache.ace.discovery.property.constants.DiscoveryConstants; +import org.apache.ace.test.constants.TestConstants; import org.osgi.service.cm.ConfigurationException; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; @@ -32,7 +33,7 @@ public class SimpleDiscoveryTest { private static final String SERVERURL_KEY = DiscoveryConstants.DISCOVERY_URL_KEY; - private static final String VALID_URL = "http://test.url.com:8080"; + private static final String VALID_URL = "http://test.url.com:" + TestConstants.PORT; private static final String INVALID_URL = "malformed url"; private PropertyBasedDiscovery m_discovery; Modified: incubator/ace/trunk/test/src/org/apache/ace/discovery/upnp/SimpleDiscoveryTest.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/discovery/upnp/SimpleDiscoveryTest.java?rev=821573&r1=821572&r2=821573&view=diff ============================================================================== --- incubator/ace/trunk/test/src/org/apache/ace/discovery/upnp/SimpleDiscoveryTest.java (original) +++ incubator/ace/trunk/test/src/org/apache/ace/discovery/upnp/SimpleDiscoveryTest.java Sun Oct 4 18:37:46 2009 @@ -23,6 +23,7 @@ import java.net.URL; import java.util.Properties; +import org.apache.ace.test.constants.TestConstants; import org.easymock.EasyMock; import org.easymock.IMocksControl; import org.osgi.framework.ServiceReference; @@ -35,7 +36,7 @@ public class SimpleDiscoveryTest { - private static final String VALID_URL = "http://test.url.com:8080"; + private static final String VALID_URL = "http://test.url.com:" + TestConstants.PORT; private static final String INVALID_URL = "malformed url"; private UPnPBasedDiscovery m_discovery; Modified: incubator/ace/trunk/test/src/org/apache/ace/obr/servlet/BundleServletTest.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/obr/servlet/BundleServletTest.java?rev=821573&r1=821572&r2=821573&view=diff ============================================================================== --- incubator/ace/trunk/test/src/org/apache/ace/obr/servlet/BundleServletTest.java (original) +++ incubator/ace/trunk/test/src/org/apache/ace/obr/servlet/BundleServletTest.java Sun Oct 4 18:37:46 2009 @@ -37,6 +37,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.ace.obr.storage.BundleStore; +import org.apache.ace.test.constants.TestConstants; import org.apache.ace.test.utils.FileUtils; import org.apache.ace.test.utils.TestUtils; import org.osgi.service.log.LogService; @@ -76,7 +77,7 @@ @SuppressWarnings("unused") public StringBuffer getRequestURL() { - return new StringBuffer("http://localhost:8080/obr/" + m_requestFile); + return new StringBuffer("http://localhost:" + TestConstants.PORT + "/obr/" + m_requestFile); } @SuppressWarnings("unused") Added: incubator/ace/trunk/test/src/org/apache/ace/test/constants/TestConstants.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/constants/TestConstants.java?rev=821573&view=auto ============================================================================== --- incubator/ace/trunk/test/src/org/apache/ace/test/constants/TestConstants.java (added) +++ incubator/ace/trunk/test/src/org/apache/ace/test/constants/TestConstants.java Sun Oct 4 18:37:46 2009 @@ -0,0 +1,29 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.ace.test.constants; + +/** + * Constants for global test parameters. Use these throughout the test + * codebase. Make sure to only use public static finals here, which + * can be inlined by the compiler. + */ +public interface TestConstants { + /** The port the webserver is running on for testing. */ + public static final int PORT = 9000; +} Modified: incubator/ace/trunk/test/src/org/apache/ace/test/deployment/DeploymentIntegrationTest.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/deployment/DeploymentIntegrationTest.java?rev=821573&r1=821572&r2=821573&view=diff ============================================================================== --- incubator/ace/trunk/test/src/org/apache/ace/test/deployment/DeploymentIntegrationTest.java (original) +++ incubator/ace/trunk/test/src/org/apache/ace/test/deployment/DeploymentIntegrationTest.java Sun Oct 4 18:37:46 2009 @@ -40,6 +40,7 @@ import org.apache.ace.http.listener.constants.HttpConstants; import org.apache.ace.identification.property.constants.IdentificationConstants; import org.apache.ace.scheduler.constants.SchedulerConstants; +import org.apache.ace.test.constants.TestConstants; import org.apache.ace.test.utils.deployment.BundleStreamGenerator; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -60,9 +61,7 @@ import org.testng.annotations.Test; public class DeploymentIntegrationTest implements BundleListener, EventHandler { - public static final String HOST = "localhost"; - public static final int PORT = 8080; public static final String GWID = "gw-id"; public static final long POLL_INTERVAL = 1000; private static Object instance; @@ -319,7 +318,7 @@ private void configureGateway() throws IOException { // configure discovery bundle - setProperty(DiscoveryConstants.DISCOVERY_PID, new Object[][] { { DiscoveryConstants.DISCOVERY_URL_KEY, "http://" + HOST + ":" + PORT } }); + setProperty(DiscoveryConstants.DISCOVERY_PID, new Object[][] { { DiscoveryConstants.DISCOVERY_URL_KEY, "http://" + HOST + ":" + TestConstants.PORT } }); // configure identification bundle setProperty(IdentificationConstants.IDENTIFICATION_PID, new Object[][] { { IdentificationConstants.IDENTIFICATION_GATEWAYID_KEY, GWID } }); // configure scheduler Modified: incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/ServletConfiguratorIntegrationTest.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/ServletConfiguratorIntegrationTest.java?rev=821573&r1=821572&r2=821573&view=diff ============================================================================== --- incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/ServletConfiguratorIntegrationTest.java (original) +++ incubator/ace/trunk/test/src/org/apache/ace/test/http/listener/ServletConfiguratorIntegrationTest.java Sun Oct 4 18:37:46 2009 @@ -31,6 +31,7 @@ import javax.servlet.http.HttpServlet; import org.apache.ace.http.listener.constants.HttpConstants; +import org.apache.ace.test.constants.TestConstants; import org.apache.felix.dependencymanager.DependencyManager; import org.apache.felix.dependencymanager.Service; import org.osgi.framework.Bundle; @@ -184,16 +185,15 @@ } - - /** - * now the server should be made available at - * http://localhost:8080/echoservlet - * if it is not available after 2000 ms, the test is failed anyway + * Now the server should be made available at + * http://SERVER:PORT/echoservlet and if it is not available after + * some time, the test is failed anyway. * * The expectSuccess parameter indicated if this method should expect a working echoservlet or a non-working one. * - * This method returns whether the expect result was met. So if you expect it to work (and it does), true will be returned. + * This method returns whether the expect result was met. So if you expect + * it to work (and it does), true will be returned. * If you expect it to NOT work (and it doesn't), false will be returned. */ private boolean waitForEchoServlet(boolean expectedResult) { @@ -204,7 +204,7 @@ boolean success = !expectedResult; try { while ((expectedResult != success) && (System.currentTimeMillis() < startTimeMillis + 30000)) { - URL echoServletUrl = new URL("http://localhost:8080/echoServlet?test"); + URL echoServletUrl = new URL("http://localhost:" + TestConstants.PORT + "/echoServlet?test"); String echoString = null; try { bufReader = new BufferedReader(new InputStreamReader(echoServletUrl.openStream())); Modified: incubator/ace/trunk/test/src/org/apache/ace/test/log/Activator.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/log/Activator.java?rev=821573&r1=821572&r2=821573&view=diff ============================================================================== --- incubator/ace/trunk/test/src/org/apache/ace/test/log/Activator.java (original) +++ incubator/ace/trunk/test/src/org/apache/ace/test/log/Activator.java Sun Oct 4 18:37:46 2009 @@ -28,6 +28,7 @@ import org.apache.ace.identification.property.constants.IdentificationConstants; import org.apache.ace.log.Log; import org.apache.ace.server.log.store.LogStore; +import org.apache.ace.test.constants.TestConstants; import org.apache.ace.test.osgi.dm.TestActivatorBase; import org.apache.felix.dependencymanager.DependencyManager; import org.osgi.framework.BundleContext; @@ -43,7 +44,6 @@ @SuppressWarnings("unchecked") private Class[] m_classes = new Class[] { LogIntegrationTest.class }; public static final String HOST = "localhost"; - public static final int PORT = 8080; public static final String GWID = "gw-id"; public static final String POLL_INTERVAL = "2"; private volatile ConfigurationAdmin m_config; @@ -93,7 +93,7 @@ } private void configureGateway() throws IOException { - setProperty(DiscoveryConstants.DISCOVERY_PID, new Object[][] { { DiscoveryConstants.DISCOVERY_URL_KEY, "http://" + HOST + ":" + PORT } }); + setProperty(DiscoveryConstants.DISCOVERY_PID, new Object[][] { { DiscoveryConstants.DISCOVERY_URL_KEY, "http://" + HOST + ":" + TestConstants.PORT } }); setProperty(IdentificationConstants.IDENTIFICATION_PID, new Object[][] { { IdentificationConstants.IDENTIFICATION_GATEWAYID_KEY, GWID } }); createFactoryInstance("org.apache.ace.gateway.log.store.factory", new Object[][] { {"name", "auditlog"} }); createFactoryInstance("org.apache.ace.gateway.log.factory", new Object[][] { {"name", "auditlog"} }); Modified: incubator/ace/trunk/test/src/org/apache/ace/test/log/LogIntegrationTest.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/log/LogIntegrationTest.java?rev=821573&r1=821572&r2=821573&view=diff ============================================================================== --- incubator/ace/trunk/test/src/org/apache/ace/test/log/LogIntegrationTest.java (original) +++ incubator/ace/trunk/test/src/org/apache/ace/test/log/LogIntegrationTest.java Sun Oct 4 18:37:46 2009 @@ -32,6 +32,7 @@ import org.apache.ace.log.LogDescriptor; import org.apache.ace.log.LogEvent; import org.apache.ace.server.log.store.LogStore; +import org.apache.ace.test.constants.TestConstants; import org.testng.annotations.Factory; import org.testng.annotations.Test; @@ -111,25 +112,25 @@ events.add(new LogEvent("47", 2, 2, 1, 1, new Properties())); m_serverStore.put(events); - List<String> result = getResponse("http://localhost:8080/auditlog/query"); + List<String> result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/query"); assert result.size() > 1 : "We expect at least two logs on the server."; - result = getResponse("http://localhost:8080/auditlog/receive?gwid=42"); + result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?gwid=42"); assert result.size() == 1 : "Gateway 42 has a single audit log event."; - result = getResponse("http://localhost:8080/auditlog/receive?gwid=47"); + result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?gwid=47"); assert result.size() == 3 : "Gateway 47 has 3 audit log events."; - result = getResponse("http://localhost:8080/auditlog/receive?gwid=47&logid=1"); + result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?gwid=47&logid=1"); assert result.size() == 1 : "Gateway 47, logid 1 has 1 audit log event."; - result = getResponse("http://localhost:8080/auditlog/receive?gwid=47&logid=2"); + result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?gwid=47&logid=2"); assert result.size() == 2 : "Gateway 47, logid 2 has 2 audit log events."; - result = getResponse("http://localhost:8080/auditlog/receive?gwid=47&logid=2&range=1"); + result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?gwid=47&logid=2&range=1"); assert result.size() == 1 : "Gateway 47, logid 2, range 1 has 1 audit log event."; - result = getResponse("http://localhost:8080/auditlog/receive?gwid=47&logid=2&range=3,5"); + result = getResponse("http://localhost:" + TestConstants.PORT + "/auditlog/receive?gwid=47&logid=2&range=3,5"); assert result.size() == 0 : "Gateway 47, logid 2, range 3,5 has 0 audit log event."; } Modified: incubator/ace/trunk/test/src/org/apache/ace/test/repository/RepositoryTest.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/repository/RepositoryTest.java?rev=821573&r1=821572&r2=821573&view=diff ============================================================================== --- incubator/ace/trunk/test/src/org/apache/ace/test/repository/RepositoryTest.java (original) +++ incubator/ace/trunk/test/src/org/apache/ace/test/repository/RepositoryTest.java Sun Oct 4 18:37:46 2009 @@ -39,6 +39,7 @@ import org.apache.ace.http.listener.constants.HttpConstants; import org.apache.ace.repository.Repository; import org.apache.ace.repository.impl.constants.RepositoryConstants; +import org.apache.ace.test.constants.TestConstants; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; import org.osgi.framework.InvalidSyntaxException; @@ -56,7 +57,7 @@ private static final int COPY_BUFFER_SIZE = 4096; private static final String MIME_APPLICATION_OCTET_STREAM = "application/octet-stream"; - private static final String HOST = "http://localhost:8080"; + private static final String HOST = "http://localhost:" + TestConstants.PORT; private volatile ConfigurationAdmin m_configAdmin; // Injected by dependency manager private volatile BundleContext m_context; // Injected by dependency manager Modified: incubator/ace/trunk/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java?rev=821573&r1=821572&r2=821573&view=diff ============================================================================== --- incubator/ace/trunk/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java (original) +++ incubator/ace/trunk/test/src/org/apache/ace/test/repositoryadmin/RepositoryAdminTest.java Sun Oct 4 18:37:46 2009 @@ -84,6 +84,7 @@ import org.apache.ace.repository.impl.constants.RepositoryConstants; import org.apache.ace.scheduler.constants.SchedulerConstants; import org.apache.ace.server.log.store.LogStore; +import org.apache.ace.test.constants.TestConstants; import org.apache.ace.test.utils.TestUtils; import org.apache.felix.dependencymanager.DependencyManager; import org.apache.felix.dependencymanager.Service; @@ -290,7 +291,7 @@ } private static final String ENDPOINT = "/AdminRepTest"; - private static final String HOST = "http://localhost:8080"; + private static final String HOST = "http://localhost:" + TestConstants.PORT; /** * Tests the behavior with logging in and out (with multiple users), and communication @@ -1273,7 +1274,7 @@ // Supply the OBR. addObr("/obr", "store"); - m_artifactRepository.setObrBase(new URL("http://localhost:8080/obr/")); + m_artifactRepository.setObrBase(new URL("http://localhost:" + TestConstants.PORT + "/obr/")); m_artifactRepository.importArtifact(temp.toURI().toURL(), true); @@ -1412,8 +1413,8 @@ @Test( groups = { TestUtils.INTEGRATION } ) public void testRepostoryLoginDoubleRepository() throws Exception { RepositoryAdminLoginContext context = m_repositoryAdmin.createLoginContext(new MockUser("user")); - context.addRepositories(new URL("http://localhost:8080"), "apache", "shop", true, ArtifactRepository.class, Artifact2GroupAssociationRepository.class, GroupRepository.class); - context.addRepositories(new URL("http://localhost:8080"), "apache", "deployment", true, GroupRepository.class, Group2LicenseAssociationRepository.class, LicenseRepository.class); + context.addRepositories(new URL("http://localhost:" + TestConstants.PORT), "apache", "shop", true, ArtifactRepository.class, Artifact2GroupAssociationRepository.class, GroupRepository.class); + context.addRepositories(new URL("http://localhost:" + TestConstants.PORT), "apache", "deployment", true, GroupRepository.class, Group2LicenseAssociationRepository.class, LicenseRepository.class); try { m_repositoryAdmin.login(context); assert false : "We tried to log in with two repositories that try to access the same repository service; this should not be allowed."; @@ -1429,8 +1430,8 @@ @Test( groups = { TestUtils.INTEGRATION } ) public void testRepostoryLoginRepositoryWithoutImplementation() throws Exception { RepositoryAdminLoginContext context = m_repositoryAdmin.createLoginContext(new MockUser("user")); - context.addRepositories(new URL("http://localhost:8080"), "apache", "shop", true, ArtifactRepository.class, Artifact2GroupAssociationRepository.class, GroupRepository.class); - context.addRepositories(new URL("http://localhost:8080"), "apache", "deployment", true, GroupRepository.class, Group2LicenseAssociationRepository.class, newRepository.class); + context.addRepositories(new URL("http://localhost:" + TestConstants.PORT), "apache", "shop", true, ArtifactRepository.class, Artifact2GroupAssociationRepository.class, GroupRepository.class); + context.addRepositories(new URL("http://localhost:" + TestConstants.PORT), "apache", "deployment", true, GroupRepository.class, Group2LicenseAssociationRepository.class, newRepository.class); try { m_repositoryAdmin.login(context); assert false : "We tried to log in with a repository for which no implementation is available; this should not be allowed."; @@ -1511,7 +1512,7 @@ @Test( groups = { TestUtils.INTEGRATION } ) public void testTemplateProcessing() throws Exception { addObr("/obr", "store"); - m_artifactRepository.setObrBase(new URL("http://localhost:8080/obr/")); + m_artifactRepository.setObrBase(new URL("http://localhost:" + TestConstants.PORT + "/obr/")); // create some template things String xmlHeader = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<metatype:MetaData xmlns:metatype= \"http://www.osgi.org/xmlns/metatype/v1.0.0\">\n"; @@ -1798,8 +1799,9 @@ configServlet.update(propsServlet); configStore.update(propsStore); - // Wait for the enpoint to respond. - URL url = new URL("http://localhost:8080" + endpoint + "/repository.xml"); + // Wait for the endpoint to respond. + // TODO below there is a similar url that does put a slash between port and endpoint, why? + URL url = new URL("http://localhost:" + TestConstants.PORT + endpoint + "/repository.xml"); int response = ((HttpURLConnection) url.openConnection()).getResponseCode(); int tries = 0; while ((response != 200) && (tries < 50)) { @@ -1822,7 +1824,7 @@ Configuration configServlet = m_configAdmin.getConfiguration("org.apache.ace.obr.servlet"); configServlet.update(propsServlet); - URL url = new URL("http://localhost:8080/" + endpoint + "/repository.xml"); + URL url = new URL("http://localhost:" + TestConstants.PORT + "/" + endpoint + "/repository.xml"); int response = ((HttpURLConnection) url.openConnection()).getResponseCode(); int tries = 0; while ((response != 404) && (tries < 50)) { Modified: incubator/ace/trunk/test/src/org/apache/ace/test/tools/RepositoryTool.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/tools/RepositoryTool.java?rev=821573&r1=821572&r2=821573&view=diff ============================================================================== --- incubator/ace/trunk/test/src/org/apache/ace/test/tools/RepositoryTool.java (original) +++ incubator/ace/trunk/test/src/org/apache/ace/test/tools/RepositoryTool.java Sun Oct 4 18:37:46 2009 @@ -37,6 +37,7 @@ import org.apache.ace.repository.RangeIterator; import org.apache.ace.repository.SortedRangeSet; +import org.apache.ace.test.constants.TestConstants; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Options; @@ -73,7 +74,7 @@ } try { CommandLine line = parser.parse(options, args, props); - String host = line.getOptionValue("host", "http://localhost:8080/"); + String host = line.getOptionValue("host", "http://localhost:" + TestConstants.PORT + "/"); String cmd = line.getOptionValue("command", "query"); String customer = line.getOptionValue("customer"); String name = line.getOptionValue("name"); Modified: incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/Activator.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/Activator.java?rev=821573&r1=821572&r2=821573&view=diff ============================================================================== --- incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/Activator.java (original) +++ incubator/ace/trunk/test/src/org/apache/ace/test/useradminconfigurator/Activator.java Sun Oct 4 18:37:46 2009 @@ -23,6 +23,7 @@ import org.apache.ace.repository.Repository; import org.apache.ace.repository.impl.constants.RepositoryConstants; +import org.apache.ace.test.constants.TestConstants; import org.apache.ace.test.osgi.dm.TestActivatorBase; import org.apache.felix.dependencymanager.DependencyManager; import org.osgi.framework.BundleContext; @@ -84,7 +85,7 @@ props = new Properties(); props.put("repositoryName", "users"); props.put("repositoryCustomer", "apache"); - props.put("repositoryLocation", "http://localhost:8080/repository"); + props.put("repositoryLocation", "http://localhost:" + TestConstants.PORT + "/repository"); config.update(props); From ace-commits-returnaaron59@example.net Sun Oct 04 18:41:45 2009 Return-Path: <ace-commits-returnaaron59@example.net> Delivered-To: aaron59@example.net Received: (qmail 44715 invoked from network); 4 Oct 2009 18:41:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Oct 2009 18:41:44 -0000 Received: (qmail 15586 invoked by uid 500); 4 Oct 2009 18:41:44 -0000 Delivered-To: aaron59@example.net Received: (qmail 15566 invoked by uid 500); 4 Oct 2009 18:41:44 -0000 Mailing-List: contact aaron59@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:aaron59@example.net> List-Unsubscribe: <mailto:aaron59@example.net> List-Post: <mailto:aaron59@example.net> List-Id: <ace-commits.incubator.apache.org> Reply-To: aaron59@example.net Delivered-To: mailing list aaron59@example.net Received: (qmail 15552 invoked by uid 99); 4 Oct 2009 18:41:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Oct 2009 18:41:44 +0000 X-ASF-Spam-Status: No, hits=3.4 required=10.0 tests=HTML_MESSAGE,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [83.161.120.155] (HELO mail.atlassian.com) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Oct 2009 18:41:33 +0000 Received: from atlassian13.managed.contegix.com (atlassian13.private [83.161.120.155]) by mail.atlassian.com (Postfix) with ESMTP id 2E5DE163016C for <aaron59@example.net>; Sun, 4 Oct 2009 13:41:12 -0500 (CDT) Received: from atlassian13.managed.contegix.com (atlassian13.managed.contegix.com [83.161.120.155]) by atlassian13.managed.contegix.com (Postfix) with ESMTP id B5EBE65B0459 for <aaron59@example.net>; Sun, 4 Oct 2009 13:41:09 -0500 (CDT) Date: Sun, 4 Oct 2009 13:41:09 -0500 (CDT) From: Atlassian Open Source Bamboo <aaron59@example.net> To: aaron59@example.net Message-ID: <19082547.aaron59@example.net> Subject: [OSS Bamboo] Apache ACE - Default build 42 has FAILED (11 tests failed, no failures were new). Change made by Marcel Offermans MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_Part_425_28457270.1254681669658" X-Virus-Checked: Checked by ClamAV on apache.org ------=_Part_425_28457270.1254681669658 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline ------=_Part_425_28457270.1254681669658 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit ----------------------------------------------------------- ACE-DEF-42 failed. ----------------------------------------------------------- Code has been updated by Marcel Offermans. 11/160 tests failed. http://opensource.bamboo.atlassian.com/browse/ACE-DEF-42/ -------------- Code Changes -------------- Marcel Offermans (821573): >Extracted the webserver port from all test classes into a TestConstants class. Set its value to 9000. Marcel Offermans (821572): >Changed the webserver port for testing to 9000. -------------- Tests -------------- Failed Tests (11) - FailTests: Fail (Existing) - LogIntegrationTest: Run tests (Existing) - ServletConfiguratorIntegrationTest: Register servlet (Existing) - ServletConfiguratorIntegrationTest: Servlet on two http services (Existing) - ServletConfiguratorIntegrationTest: Start http service (Existing) - RepositoryTest: Bad requests (Existing) - RepositoryTest: Checkout and commit (Existing) - RepositoryTest: Creation (Existing) - RepositoryTest: Get and put (Existing) - RepositoryTest: Initial content (Existing) - RepositoryTest: Master (Existing) Fixed Tests (1) - ConfiguratorTest: Configurator test -------------- Error Summary -------------- Failed to parse test result file &quot;coverage.xml&quot; -- This message is automatically generated by Atlassian Bamboo ------=_Part_425_28457270.1254681669658-- From ace-commits-returnaaron59@example.net Sun Oct 04 19:13:25 2009 Return-Path: <ace-commits-returnaaron59@example.net> Delivered-To: aaron59@example.net Received: (qmail 48754 invoked from network); 4 Oct 2009 19:13:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 4 Oct 2009 19:13:25 -0000 Received: (qmail 44610 invoked by uid 500); 4 Oct 2009 19:13:25 -0000 Delivered-To: aaron59@example.net Received: (qmail 44591 invoked by uid 500); 4 Oct 2009 19:13:25 -0000 Mailing-List: contact aaron59@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:aaron59@example.net> List-Unsubscribe: <mailto:aaron59@example.net> List-Post: <mailto:aaron59@example.net> List-Id: <ace-commits.incubator.apache.org> Reply-To: aaron59@example.net Delivered-To: mailing list aaron59@example.net Received: (qmail 44581 invoked by uid 99); 4 Oct 2009 19:13:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Oct 2009 19:13:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Oct 2009 19:13:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534)
{'source': 'Apache Software Foundation Public Mail Archives'}