August 2009 - gatein-commits - Jboss List Archives

gatein SVN: r130 - components/mop/trunk/core/src/main/java/org/gatein/mop/core/api.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2009-08-30 08:15:06 -0400 (Sun, 30 Aug 2009) New Revision: 130 Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java Log: add convenient method for dealing with object by their path Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java =================================================================== --- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java 2009-08-30 05:40:59 UTC (rev 129) +++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java 2009-08-30 12:15:06 UTC (rev 130) @@ -129,10 +129,15 @@ return q.execute(type.getJavaType()); } - public String getPath(Object o) { + public String getPath(WorkspaceObject o) { return session.getPath(o); } + public <O extends WorkspaceObject> O getObject(ObjectType<? extends O> type, String path) { + Class<? extends O> t = type.getJavaType(); + return session.findByPath(t, path); + } + private void inject(Object o, boolean persistent) { if (o instanceof UIWindowImpl) { ((UIWindowImpl)o).setContentManager(contentManager);

14 years, 8 months

1
0
0 / 0

gatein SVN: r129 - in components/pc/trunk: bridge and 11 other directories.

by do-not-reply＠jboss.org

Author: mwringe Date: 2009-08-30 01:40:59 -0400 (Sun, 30 Aug 2009) New Revision: 129 Modified: components/pc/trunk/api/ components/pc/trunk/bridge/ components/pc/trunk/build/pom.xml components/pc/trunk/controller/ components/pc/trunk/federation/ components/pc/trunk/jsr168api/ components/pc/trunk/management/ components/pc/trunk/mc/ components/pc/trunk/portal/ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/MimeResponseImpl.java components/pc/trunk/samples/ components/pc/trunk/test/ components/pc/trunk/test/src/test/build.xml Log: Renable JBoss 5 tests. Still have 3 test failures. Rollback MimeResponseImpl setContentType to get tests running again. Add some more target directories to svn:ignore. Property changes on: components/pc/trunk/api ___________________________________________________________________ Name: svn:ignore + target Property changes on: components/pc/trunk/bridge ___________________________________________________________________ Name: svn:ignore + target Modified: components/pc/trunk/build/pom.xml =================================================================== --- components/pc/trunk/build/pom.xml 2009-08-29 21:59:04 UTC (rev 128) +++ components/pc/trunk/build/pom.xml 2009-08-30 05:40:59 UTC (rev 129) @@ -41,7 +41,7 @@ <version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient> <version.jboss.microcontainer>2.0.2.GA</version.jboss.microcontainer> <version.jboss.reflect>2.0.2.GA</version.jboss.reflect> - <version.cargo>1.0-alpha-6</version.cargo> + <version.cargo>1.0.1-SNAPSHOT</version.cargo> <version.junit>3.8.2</version.junit> <version.ant>1.7.0</version.ant> <version.sun-jaxb>2.1.4</version.sun-jaxb> Property changes on: components/pc/trunk/controller ___________________________________________________________________ Name: svn:ignore + target Property changes on: components/pc/trunk/federation ___________________________________________________________________ Name: svn:ignore + target Property changes on: components/pc/trunk/jsr168api ___________________________________________________________________ Name: svn:ignore + target Property changes on: components/pc/trunk/management ___________________________________________________________________ Name: svn:ignore + target Property changes on: components/pc/trunk/mc ___________________________________________________________________ Name: svn:ignore + target Property changes on: components/pc/trunk/portal ___________________________________________________________________ Name: svn:ignore + target Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/MimeResponseImpl.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/MimeResponseImpl.java 2009-08-29 21:59:04 UTC (rev 128) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/MimeResponseImpl.java 2009-08-30 05:40:59 UTC (rev 129) @@ -125,8 +125,11 @@ public void setContentType(String contentType) { - responseContent.setContentType(contentType); - contentTypeSet = true; + if (responseContent.getContentType() == null) + { + responseContent.setContentType(contentType); + contentTypeSet = true; + } } public PrintWriter getWriter() throws IOException Property changes on: components/pc/trunk/samples ___________________________________________________________________ Name: svn:ignore + target Property changes on: components/pc/trunk/test ___________________________________________________________________ Name: svn:ignore + target Modified: components/pc/trunk/test/src/test/build.xml =================================================================== --- components/pc/trunk/test/src/test/build.xml 2009-08-29 21:59:04 UTC (rev 128) +++ components/pc/trunk/test/src/test/build.xml 2009-08-30 05:40:59 UTC (rev 129) @@ -306,7 +306,7 @@ </and> </condition> </fail> -  + </fail> </target> <target name="__evaluate_properties.local"> @@ -729,7 +729,7 @@ <echo message="jboss-5.0-shared : ${jboss-5.0-shared-property}"/> <cargo - containerId="jboss5x" + containerId="jboss51x" home="${test.jboss-5.0.home}" log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" output="${cargo.log.dir}/cargo.${test.id}.server.log" @@ -753,7 +753,7 @@ <target name="__cargo.jboss-5.0.stop" depends="__cargo.setup"> <cargo - containerId="jboss5x" + containerId="jboss51x" home="${test.jboss-5.0.home}" log="${cargo.log.dir}/cargo.${test.id}.startup.log" action="stop"> @@ -804,7 +804,7 @@ <target name="tests.jboss"> <antcall target="tests.jboss-4.2"/> -  + <antcall target="tests.jboss-5.0"/> </target> <target name="tests.local"> @@ -836,7 +836,7 @@ <configuration> <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> -  + <deployable type="war" file="${test.temp.lib}/manager.war"/> <deployable type="war" file="${test.temp.lib}/tomcat-6.0/portlet-test.war"/> </configuration>

14 years, 8 months

1
0
0 / 0

gatein SVN: r128 - in components/pc/trunk/portlet: src/main/java/org/gatein/pc/portlet/impl/jsr168/api and 1 other directory.

by do-not-reply＠jboss.org

Author: mwringe Date: 2009-08-29 17:59:04 -0400 (Sat, 29 Aug 2009) New Revision: 128 Removed: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/ResourceResponseImpl.java.merge-left.r13522 components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/ResourceResponseImpl.java.merge-right.r13523 components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/ResourceResponseImpl.java.working Modified: components/pc/trunk/portlet/ Log: minor svn clean up, remove files that shouldn't have been committed and add target to svn ignore. Property changes on: components/pc/trunk/portlet ___________________________________________________________________ Name: svn:ignore + target Deleted: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/ResourceResponseImpl.java.merge-left.r13522 =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/ResourceResponseImpl.java.merge-left.r13522 2009-08-29 21:50:55 UTC (rev 127) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/ResourceResponseImpl.java.merge-left.r13522 2009-08-29 21:59:04 UTC (rev 128) @@ -1,103 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.impl.jsr168.api; - -import org.jboss.portal.portlet.invocation.ResourceInvocation; -import org.jboss.portal.portlet.invocation.response.ContentResponse; -import org.jboss.portal.portlet.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.cache.CacheLevel; -import org.jboss.portal.portlet.cache.CacheControl; - -import javax.portlet.ResourceResponse; -import javax.portlet.PortletURL; -import java.util.Locale; -import java.util.Map; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public class ResourceResponseImpl extends MimeResponseImpl implements ResourceResponse -{ - - /** . */ - private final CacheLevel cacheability; - - public ResourceResponseImpl(ResourceInvocation invocation, PortletRequestImpl preq) - { - super(invocation, preq); - - // - this.cacheability = invocation.getCacheLevel(); - } - - public void setLocale(Locale locale) - { - throw new UnsupportedOperationException(); - } - - public void setCharacterEncoding(String s) - { - throw new UnsupportedOperationException(); - } - - public void setContentLength(int i) - { - throw new UnsupportedOperationException(); - } - - public PortletURL createActionURL() - { - if (cacheability != CacheLevel.PAGE) - { - throw new IllegalStateException("Cannot create action URL because the current cache level " + cacheability + - " is not " + CacheLevel.PAGE); - } - - // - return super.createActionURL(); - } - - public PortletURL createRenderURL() - { - if (cacheability != CacheLevel.PAGE) - { - throw new IllegalStateException("Cannot create render URL because the current cache level " + cacheability + - " is not " + CacheLevel.PAGE); - } - - // - return super.createRenderURL(); - } - - protected ContentResponse createMarkupResponse(ResponseProperties properties, Map<String, Object> attributeMap, String contentType, byte[] bytes, String chars, CacheControl cacheControl) - { - return new ContentResponse( - properties, - attributeMap, - contentType, - bytes, - chars, - cacheControl); - } -} Deleted: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/ResourceResponseImpl.java.merge-right.r13523 =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/ResourceResponseImpl.java.merge-right.r13523 2009-08-29 21:50:55 UTC (rev 127) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/ResourceResponseImpl.java.merge-right.r13523 2009-08-29 21:59:04 UTC (rev 128) @@ -1,103 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.impl.jsr168.api; - -import org.jboss.portal.portlet.api.invocation.ResourceInvocation; -import org.jboss.portal.portlet.api.invocation.response.ContentResponse; -import org.jboss.portal.portlet.api.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.api.cache.CacheLevel; -import org.jboss.portal.portlet.api.cache.CacheControl; - -import javax.portlet.ResourceResponse; -import javax.portlet.PortletURL; -import java.util.Locale; -import java.util.Map; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public class ResourceResponseImpl extends MimeResponseImpl implements ResourceResponse -{ - - /** . */ - private final CacheLevel cacheability; - - public ResourceResponseImpl(ResourceInvocation invocation, PortletRequestImpl preq) - { - super(invocation, preq); - - // - this.cacheability = invocation.getCacheLevel(); - } - - public void setLocale(Locale locale) - { - throw new UnsupportedOperationException(); - } - - public void setCharacterEncoding(String s) - { - throw new UnsupportedOperationException(); - } - - public void setContentLength(int i) - { - throw new UnsupportedOperationException(); - } - - public PortletURL createActionURL() - { - if (cacheability != CacheLevel.PAGE) - { - throw new IllegalStateException("Cannot create action URL because the current cache level " + cacheability + - " is not " + CacheLevel.PAGE); - } - - // - return super.createActionURL(); - } - - public PortletURL createRenderURL() - { - if (cacheability != CacheLevel.PAGE) - { - throw new IllegalStateException("Cannot create render URL because the current cache level " + cacheability + - " is not " + CacheLevel.PAGE); - } - - // - return super.createRenderURL(); - } - - protected ContentResponse createMarkupResponse(ResponseProperties properties, Map<String, Object> attributeMap, String contentType, byte[] bytes, String chars, CacheControl cacheControl) - { - return new ContentResponse( - properties, - attributeMap, - contentType, - bytes, - chars, - cacheControl); - } -} Deleted: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/ResourceResponseImpl.java.working =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/ResourceResponseImpl.java.working 2009-08-29 21:50:55 UTC (rev 127) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/ResourceResponseImpl.java.working 2009-08-29 21:59:04 UTC (rev 128) @@ -1,145 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.impl.jsr168.api; - -import org.jboss.portal.common.net.media.ContentType; -import org.jboss.portal.common.net.media.MediaType; -import org.jboss.portal.common.net.media.Parameter; -import org.jboss.portal.portlet.invocation.ResourceInvocation; -import org.jboss.portal.portlet.invocation.response.ContentResponse; -import org.jboss.portal.portlet.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.cache.CacheLevel; -import org.jboss.portal.portlet.cache.CacheControl; - -import javax.portlet.ResourceResponse; -import javax.portlet.PortletURL; - -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public class ResourceResponseImpl extends MimeResponseImpl implements ResourceResponse -{ - - /** . */ - private final CacheLevel cacheability; - - public ResourceResponseImpl(ResourceInvocation invocation, PortletRequestImpl preq) - { - super(invocation, preq); - - // - this.cacheability = invocation.getCacheLevel(); - } - - public void setLocale(Locale locale) - { - // TODO: setLocale should also set the character encoding according to the mapping done in web.xml - - if (locale == null) - { - throw new IllegalArgumentException("Locale cannot be null"); - } - if ("".equals(locale.getCountry())) - { - addProperty("Content-Language", locale.getLanguage()); - } - else - { - addProperty("Content-Language", locale.getLanguage() + "-" + locale.getCountry()); - } - } - - public void setCharacterEncoding(String s) - { - List<Parameter> parameters = new ArrayList<Parameter>(); - MediaType mediaType = null; - - String contentTypeString = getContentType(); - if (contentTypeString != null) - { - ContentType contentType = ContentType.create(contentTypeString); - mediaType = contentType.getMediaType(); - for (Parameter parameter : contentType.getParameters()) - { - if (!parameter.getName().trim().toLowerCase().equals("charset")) - { - parameters.add(parameter); - } - } - } - else - { - // Default to "text/html" - mediaType = MediaType.TEXT_HTML; - } - parameters.add(new Parameter("charset", s)); - - setContentType(new ContentType(mediaType, parameters).getValue()); - } - - public void setContentLength(int i) - { - addProperty("Content-Length", "" + i); - } - - public PortletURL createActionURL() - { - if (cacheability != CacheLevel.PAGE) - { - throw new IllegalStateException("Cannot create action URL because the current cache level " + cacheability + - " is not " + CacheLevel.PAGE); - } - - // - return super.createActionURL(); - } - - public PortletURL createRenderURL() - { - if (cacheability != CacheLevel.PAGE) - { - throw new IllegalStateException("Cannot create render URL because the current cache level " + cacheability + - " is not " + CacheLevel.PAGE); - } - - // - return super.createRenderURL(); - } - - protected ContentResponse createMarkupResponse(ResponseProperties properties, Map<String, Object> attributeMap, String contentType, byte[] bytes, String chars, CacheControl cacheControl) - { - return new ContentResponse( - properties, - attributeMap, - contentType, - bytes, - chars, - cacheControl); - } -}

14 years, 8 months

1
0
0 / 0

gatein SVN: r127 - components/pc/trunk/test.

by do-not-reply＠jboss.org

Author: aheritier Date: 2009-08-29 17:50:55 -0400 (Sat, 29 Aug 2009) New Revision: 127 Modified: components/pc/trunk/test/pom.xml Log: Fix issue with test-jar for all versions of Maven Modified: components/pc/trunk/test/pom.xml =================================================================== --- components/pc/trunk/test/pom.xml 2009-08-29 21:32:41 UTC (rev 126) +++ components/pc/trunk/test/pom.xml 2009-08-29 21:50:55 UTC (rev 127) @@ -28,6 +28,7 @@ <artifactId>pc-portlet</artifactId> <version>${project.version}</version> <type>test-jar</type> + <classifier>tests</classifier> </dependency> <dependency> <groupId>org.gatein.pc</groupId>

14 years, 8 months

1
0
0 / 0

gatein SVN: r126 - components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/jsr168/api/portletcontext.

by do-not-reply＠jboss.org

Author: mwringe Date: 2009-08-29 17:32:41 -0400 (Sat, 29 Aug 2009) New Revision: 126 Modified: components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java Log: Fix the version string to accept -SNAPSHOT at the end. Note that this fix was applied before but didn't make it through the rollback. Modified: components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java =================================================================== --- components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java 2009-08-29 21:19:29 UTC (rev 125) +++ components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/jsr168/api/portletcontext/ServerInfoTestCase.java 2009-08-29 21:32:41 UTC (rev 126) @@ -47,7 +47,7 @@ { /** . */ - private static final String VERSION_REGEX = "JBossPortletContainer/[0-9]+\\.[0-9]+"; + private static final String VERSION_REGEX = "JBossPortletContainer/[0-9]+\\.[0-9]+(|\\.SNAPSHOT)"; /** . */ private static final Pattern VERSION_PATTERN = Pattern.compile(VERSION_REGEX, Pattern.CASE_INSENSITIVE);

14 years, 8 months

1
0
0 / 0

gatein SVN: r125 - components/pc/trunk/portlet.

by do-not-reply＠jboss.org

Author: mwringe Date: 2009-08-29 17:19:29 -0400 (Sat, 29 Aug 2009) New Revision: 125 Modified: components/pc/trunk/portlet/pom.xml Log: Fix test compile issue. Modified: components/pc/trunk/portlet/pom.xml =================================================================== --- components/pc/trunk/portlet/pom.xml 2009-08-29 21:09:33 UTC (rev 124) +++ components/pc/trunk/portlet/pom.xml 2009-08-29 21:19:29 UTC (rev 125) @@ -76,7 +76,7 @@ </executions> <configuration> <testExcludes> - <exclude>org/jboss/portal/unit/reports/*</exclude> + <exclude>org/gatein/pc/test/unit/reports/*</exclude> </testExcludes> </configuration> </plugin>

14 years, 8 months

1
0
0 / 0

gatein SVN: r124 - components/common/trunk.

by do-not-reply＠jboss.org

Author: dbaeli Date: 2009-08-29 17:09:33 -0400 (Sat, 29 Aug 2009) New Revision: 124 Modified: components/common/trunk/pom.xml Log: JBoss Portal => GateIn Modified: components/common/trunk/pom.xml =================================================================== --- components/common/trunk/pom.xml 2009-08-29 19:51:25 UTC (rev 123) +++ components/common/trunk/pom.xml 2009-08-29 21:09:33 UTC (rev 124) @@ -4,7 +4,7 @@ <groupId>org.gatein.common</groupId> <artifactId>module-aggregator</artifactId> <packaging>pom</packaging> - <name>JBoss Portal Modules Common (aggregator)</name> + <name>GateIn Modules Common (aggregator)</name> <version>3.0.0-SNAPSHOT</version> <distributionManagement>

14 years, 8 months

1
0
0 / 0

gatein SVN: r123 - components/wci/trunk/wci/src/test.

by do-not-reply＠jboss.org

Author: mwringe Date: 2009-08-29 15:51:25 -0400 (Sat, 29 Aug 2009) New Revision: 123 Modified: components/wci/trunk/wci/src/test/build.xml Log: Renable the JBoss 5 tests. Modified: components/wci/trunk/wci/src/test/build.xml =================================================================== --- components/wci/trunk/wci/src/test/build.xml 2009-08-29 19:22:47 UTC (rev 122) +++ components/wci/trunk/wci/src/test/build.xml 2009-08-29 19:51:25 UTC (rev 123) @@ -25,7 +25,7 @@ </target> <target name="tests.call.all" unless="tests"> - + <antcall target="tests.jboss5"/> <antcall target="tests.jboss"/> <antcall target="tests.tomcat"/>  @@ -100,14 +100,14 @@ </not> </and> </condition> - + </condition> <condition property="TOMCAT_6_0_HOME" value="${env.TOMCAT_6_0_HOME}"> <and> <isset property="env.TOMCAT_6_0_HOME"/> @@ -147,7 +147,7 @@ </condition> </fail> - + </fail> <fail message="Please set the environment variable TOMCAT_6_0_HOME or use -Dtest.specified.containers to only run tests for containers specified with a HOME variable"> <condition>

14 years, 8 months

1
0
0 / 0

gatein SVN: r122 - in components/wci/trunk: wci and 1 other directories.

by do-not-reply＠jboss.org

Author: mwringe Date: 2009-08-29 15:22:47 -0400 (Sat, 29 Aug 2009) New Revision: 122 Modified: components/wci/trunk/build/pom.xml components/wci/trunk/wci/ components/wci/trunk/wci/pom.xml components/wci/trunk/wci/src/test/build.xml Log: Fix test issues and failures. Modified: components/wci/trunk/build/pom.xml =================================================================== --- components/wci/trunk/build/pom.xml 2009-08-29 18:57:56 UTC (rev 121) +++ components/wci/trunk/build/pom.xml 2009-08-29 19:22:47 UTC (rev 122) @@ -31,16 +31,18 @@ <version.jetty>6.1.7</version.jetty> <version.jboss-logging>2.0.4.GA</version.jboss-logging> <version.apache.log4j>1.2.14</version.apache.log4j> - <version.jboss-remoting>2.2.2.SP1</version.jboss-remoting> + <version.jboss-remoting>2.5.0.GA</version.jboss-remoting> <version.jboss.portal.common>3.0.0-SNAPSHOT</version.jboss.portal.common> <version.jboss.unit>1.2.2</version.jboss.unit> <version.jboss-reflect>2.0.2.GA</version.jboss-reflect> <version.apache.commons-logging>1.1.0.jboss</version.apache.commons-logging> <version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient> <version.jboss.microcontainer>2.0.2.GA</version.jboss.microcontainer> - <version.cargo>1.0-alpha-6</version.cargo> + <version.jboss.serialization>1.0.3.GA</version.jboss.serialization> + <version.cargo>1.0.1-SNAPSHOT</version.cargo> <version.junit>3.8.2-brew</version.junit> <version.ant>1.7.0</version.ant> + <version.jaxb>2.1</version.jaxb> </properties> <repositories> @@ -65,6 +67,16 @@ <enabled>false</enabled> </releases> </repository> + <repository> + <id>codehaus snapshot repository</id> + <url>http://snapshots.repository.codehaus.org/</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> </repositories> <build> @@ -181,7 +193,7 @@ </dependency> <dependency> - <groupId>jboss</groupId> + <groupId>org.jboss.remoting</groupId> <artifactId>jboss-remoting</artifactId> <version>${version.jboss-remoting}</version> </dependency> @@ -196,8 +208,13 @@ <artifactId>jboss-dependency</artifactId> <version>${version.jboss.microcontainer}</version> </dependency> - <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-serialization</artifactId> + <version>${version.jboss.serialization}</version> + </dependency> + + <dependency> <groupId>concurrent</groupId> <artifactId>concurrent</artifactId> <version>${version.concurrent}</version> @@ -207,7 +224,7 @@ <artifactId>jboss-kernel</artifactId> <version>${version.jboss.microcontainer}</version> </dependency> - + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> @@ -245,6 +262,11 @@ <artifactId>cargo-core-uberjar</artifactId> <version>${version.cargo}</version> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${version.jaxb}</version> + </dependency> </dependencies> </dependencyManagement> Property changes on: components/wci/trunk/wci ___________________________________________________________________ Name: svn:ignore + target Modified: components/wci/trunk/wci/pom.xml =================================================================== --- components/wci/trunk/wci/pom.xml 2009-08-29 18:57:56 UTC (rev 121) +++ components/wci/trunk/wci/pom.xml 2009-08-29 19:22:47 UTC (rev 122) @@ -97,7 +97,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>jboss</groupId> + <groupId>org.jboss.remoting</groupId> <artifactId>jboss-remoting</artifactId> </dependency> <dependency> @@ -116,6 +116,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-serialization</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <scope>test</scope> @@ -134,6 +139,11 @@ <artifactId>saxpath</artifactId> </dependency> <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>cargo</groupId> <artifactId>cargo-manager</artifactId> <type>war</type> @@ -228,7 +238,7 @@ <property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/> <property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/> <property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/> - <property name="dependency.jboss-remoting.jar" value="${maven.dependency.jboss.jboss-remoting.jar.path}"/> + <property name="dependency.jboss-remoting.jar" value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>  <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}"/> @@ -245,6 +255,7 @@ <property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/> <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/> <property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/> + <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>  <property name="dependency.cargo.jetty-deployer" value="${maven.dependency.org.codehaus.cargo.cargo-jetty-deployer.war.path}"/> Modified: components/wci/trunk/wci/src/test/build.xml =================================================================== --- components/wci/trunk/wci/src/test/build.xml 2009-08-29 18:57:56 UTC (rev 121) +++ components/wci/trunk/wci/src/test/build.xml 2009-08-29 19:22:47 UTC (rev 122) @@ -268,6 +268,7 @@ <path location="${dependency.activation.jar}"/> <path location="${dependency.junit.jar}"/> <path location="${target}/wci-wci-${project.version}.jar"/> + <path location="${dependency.jboss-serialization.jar}"/> </path> <path id="jetty-6.1"> @@ -597,8 +598,9 @@  <copy file="${dependency.cargo-manager.war}" tofile="${test.temp.lib}/manager.war"/> +  + <unzip src="${test.temp.lib}/manager.war" dest="${test.temp.lib}/manager"/> - </target> <target name="cargo.setup"> @@ -884,6 +886,7 @@  <deployable type="war" file="${test.temp.lib}/manager.war"/> + <file file="${test.temp.lib}/manager" todir="webapps/manager"/> <deployable type="war" file="${cargo.war}"/> </configuration> </cargo>

14 years, 8 months

1
0
0 / 0

gatein SVN: r120 - in components: common/trunk/build and 5 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2009-08-28 20:39:46 -0400 (Fri, 28 Aug 2009) New Revision: 120 Removed: components/common/trunk/.classpath components/common/trunk/.project components/common/trunk/.settings/ components/common/trunk/build/.project components/common/trunk/common/.classpath components/common/trunk/common/.project components/common/trunk/mc/.classpath components/common/trunk/mc/.project components/pc/trunk/.classpath components/pc/trunk/.project components/pc/trunk/.settings/ components/wci/trunk/.classpath components/wci/trunk/.project components/wci/trunk/.settings/ components/wci/trunk/build/.project Log: remove old eclipse files Deleted: components/common/trunk/.classpath =================================================================== --- components/common/trunk/.classpath 2009-08-29 00:32:53 UTC (rev 119) +++ components/common/trunk/.classpath 2009-08-29 00:39:46 UTC (rev 120) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" output="common/target/classes" path="common/src/main/java"/> - <classpathentry kind="src" output="common/target/test-classes" path="common/src/test/java"/> - <classpathentry excluding="**" kind="src" output="common/target/test-classes" path="common/src/test/resources"/> - <classpathentry kind="src" output="mc/target/classes" path="mc/src/main/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> Deleted: components/common/trunk/.project =================================================================== --- components/common/trunk/.project 2009-08-29 00:32:53 UTC (rev 119) +++ components/common/trunk/.project 2009-08-29 00:39:46 UTC (rev 120) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>common</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> Deleted: components/common/trunk/build/.project =================================================================== --- components/common/trunk/build/.project 2009-08-29 00:32:53 UTC (rev 119) +++ components/common/trunk/build/.project 2009-08-29 00:39:46 UTC (rev 120) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>build</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - </buildSpec> - <natures> - </natures> -</projectDescription> Deleted: components/common/trunk/common/.classpath =================================================================== --- components/common/trunk/common/.classpath 2009-08-29 00:32:53 UTC (rev 119) +++ components/common/trunk/common/.classpath 2009-08-29 00:39:46 UTC (rev 120) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src/main"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="/thirdparty/apache-ant/lib/ant.jar"/> - <classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/> - <classpathentry kind="lib" path="/tools/lib/xalan.jar"/> - <classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/> - <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/> - <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/> - <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/> - <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/> - <classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/> - <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/> - <classpathentry kind="lib" path="/tools/lib/cargo-core-uberjar-0.8.jar"/> - <classpathentry kind="lib" path="/tools/lib/ant-junit.jar"/> - <classpathentry kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/> - <classpathentry kind="lib" path="/thirdparty/jboss/backport-concurrent/lib/jboss-backport-concurrent.jar"/> - <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/> - <classpathentry kind="output" path="bin"/> -</classpath> Deleted: components/common/trunk/common/.project =================================================================== --- components/common/trunk/common/.project 2009-08-29 00:32:53 UTC (rev 119) +++ components/common/trunk/common/.project 2009-08-29 00:39:46 UTC (rev 120) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>common</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> Deleted: components/common/trunk/mc/.classpath =================================================================== --- components/common/trunk/mc/.classpath 2009-08-29 00:32:53 UTC (rev 119) +++ components/common/trunk/mc/.classpath 2009-08-29 00:39:46 UTC (rev 120) @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src/main"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="output" path="bin"/> -</classpath> Deleted: components/common/trunk/mc/.project =================================================================== --- components/common/trunk/mc/.project 2009-08-29 00:32:53 UTC (rev 119) +++ components/common/trunk/mc/.project 2009-08-29 00:39:46 UTC (rev 120) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>api</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> Deleted: components/pc/trunk/.classpath =================================================================== --- components/pc/trunk/.classpath 2009-08-29 00:32:53 UTC (rev 119) +++ components/pc/trunk/.classpath 2009-08-29 00:39:46 UTC (rev 120) @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" output="api/target/classes" path="api/src/main/java"/> - <classpathentry kind="src" output="api/target/test-classes" path="api/src/test/java"/> - <classpathentry kind="src" path="exo/src/main/java"/> - <classpathentry kind="src" output="controller/target/classes" path="controller/src/main/java"/> - <classpathentry kind="src" output="controller/target/test-classes" path="controller/src/test/java"/> - <classpathentry excluding="**" kind="src" output="controller/target/test-classes" path="controller/src/test/resources"/> - <classpathentry kind="src" output="bridge/target/classes" path="bridge/src/main/java"/> - <classpathentry kind="src" output="federation/target/classes" path="federation/src/main/java"/> - <classpathentry kind="src" output="federation/target/test-classes" path="federation/src/test/java"/> - <classpathentry excluding="**" kind="src" output="federation/target/test-classes" path="federation/src/test/resources"/> - <classpathentry kind="src" output="management/target/classes" path="management/src/main/java"/> - <classpathentry kind="src" output="mc/target/classes" path="mc/src/main/java"/> - <classpathentry kind="src" output="mc/target/test-classes" path="mc/src/test/java"/> - <classpathentry excluding="**" kind="src" output="mc/target/test-classes" path="mc/src/test/resources"/> - <classpathentry kind="src" output="test/target/classes" path="test/src/main/java"/> - <classpathentry kind="src" output="test/target/test-classes" path="test/src/test/java"/> - <classpathentry excluding="**" kind="src" output="test/target/test-classes" path="test/src/test/resources"/> - <classpathentry kind="src" output="portal/target/classes" path="portal/src/main/java"/> - <classpathentry excluding="**" kind="src" output="portal/target/classes" path="portal/src/main/resources"/> - <classpathentry kind="src" output="portal/target/test-classes" path="portal/src/test/java"/> - <classpathentry excluding="**" kind="src" output="portal/target/test-classes" path="portal/src/test/resources"/> - <classpathentry kind="src" output="samples/target/classes" path="samples/src/main/java"/> - <classpathentry kind="src" path="pc/src/main/java"/> - <classpathentry excluding="java/" kind="src" path="pc/src/main"/> - <classpathentry kind="src" path="pc/src/test/java"/> - <classpathentry kind="src" path="pc/src/test/resources"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/modules"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> Deleted: components/pc/trunk/.project =================================================================== --- components/pc/trunk/.project 2009-08-29 00:32:53 UTC (rev 119) +++ components/pc/trunk/.project 2009-08-29 00:39:46 UTC (rev 120) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>pc</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - </natures> -</projectDescription> Deleted: components/wci/trunk/.classpath =================================================================== --- components/wci/trunk/.classpath 2009-08-29 00:32:53 UTC (rev 119) +++ components/wci/trunk/.classpath 2009-08-29 00:39:46 UTC (rev 120) @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" output="exo/target/classes" path="exo/src/main/java"/> - <classpathentry excluding="**" kind="src" output="exo/target/classes" path="exo/src/main/resources"/> - <classpathentry kind="src" output="exo/target/test-classes" path="exo/src/test/java"/> - <classpathentry kind="src" path="wci/src/main/java"/> - <classpathentry kind="src" path="wci/src/test/java"/> - <classpathentry kind="src" path="wci/src/main/resources"/> - <classpathentry excluding="java/" kind="src" path="wci/src/test"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> Deleted: components/wci/trunk/.project =================================================================== --- components/wci/trunk/.project 2009-08-29 00:32:53 UTC (rev 119) +++ components/wci/trunk/.project 2009-08-29 00:39:46 UTC (rev 120) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>wci</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.maven.ide.eclipse.maven2Nature</nature> - </natures> -</projectDescription> Deleted: components/wci/trunk/build/.project =================================================================== --- components/wci/trunk/build/.project 2009-08-29 00:32:53 UTC (rev 119) +++ components/wci/trunk/build/.project 2009-08-29 00:39:46 UTC (rev 120) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>build</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - </buildSpec> - <natures> - </natures> -</projectDescription>

14 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits August 2009