gatein SVN: r65 - in components/mop/trunk: parent and 1 other directory.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-08-25 17:25:27 -0400 (Tue, 25 Aug 2009)
New Revision: 65
Modified:
components/mop/trunk/parent/pom.xml
components/mop/trunk/pom.xml
Log:
Fix repo declaration for JBoss
Modified: components/mop/trunk/parent/pom.xml
===================================================================
--- components/mop/trunk/parent/pom.xml 2009-08-25 21:24:14 UTC (rev 64)
+++ components/mop/trunk/parent/pom.xml 2009-08-25 21:25:27 UTC (rev 65)
@@ -1,23 +1,11 @@
-<!--
- Copyright (C) 2009 eXo Platform SAS.
+ <!--
- 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.
-
--->
+ Copyright (C) 2009 eXo Platform SAS. 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.
+ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!--
@@ -64,13 +52,14 @@
<url>http://fisheye.exoplatform.org/browse/projects-internal/exorh/exo-portal/...</url>
</scm>
+ <!-- Required to download Parent -->
<repositories>
<repository>
- <id>jboss.com</id>
- <url>http://repository.jboss.com/maven2</url>
+ <id>repository.jboss.org</id>
+ <url>http://repository.jboss.org/maven2</url>
</repository>
</repositories>
-
+
<dependencies>
<dependency>
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2009-08-25 21:24:14 UTC (rev 64)
+++ components/mop/trunk/pom.xml 2009-08-25 21:25:27 UTC (rev 65)
@@ -58,6 +58,14 @@
<developerConnection>scm:svn:http://svn.exoplatform.org/projects/exorh/exo-portal/mop/trunk/</developerConnection>
<url>http://fisheye.exoplatform.org/browse/projects-internal/exorh/exo-portal/...</url>
</scm>
+
+ <!-- Required to download Parent -->
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
+ </repositories>
<!-- **************** -->
<!-- Build Definition -->
15 years, 4 months
- 1
- 0
gatein SVN: r64 - in components/common/trunk/common/src: main/java/org/gatein/common/util and 3 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-08-25 17:24:14 -0400 (Tue, 25 Aug 2009)
New Revision: 64
Added:
components/common/trunk/common/src/test/java/org/gatein/common/ExtendedAssert.java
Removed:
components/common/trunk/common/src/main/java/org/gatein/common/adapter/
components/common/trunk/common/src/main/java/org/gatein/common/junit/
components/common/trunk/common/src/main/java/org/gatein/common/logging/
components/common/trunk/common/src/main/java/org/gatein/common/path/
components/common/trunk/common/src/main/java/org/gatein/common/transaction/
components/common/trunk/common/src/test/java/org/gatein/common/PathMapperTestCase.java
components/common/trunk/common/src/test/java/org/gatein/common/PathTestCase.java
components/common/trunk/common/src/test/java/org/gatein/common/adapter/
Modified:
components/common/trunk/common/src/main/java/org/gatein/common/util/Tools.java
components/common/trunk/common/src/test/java/org/gatein/common/ParameterMapTestCase.java
components/common/trunk/common/src/test/java/org/gatein/common/ToolsTestCase.java
components/common/trunk/common/src/test/java/org/gatein/common/io/IOToolsTestCase.java
components/common/trunk/common/src/test/java/org/gatein/common/io/SerializationTestCase.java
components/common/trunk/common/src/test/java/org/gatein/common/net/AbstractSynchronizedServer.java
components/common/trunk/common/src/test/java/org/gatein/common/net/URLToolsTestCase.java
Log:
GTNCOMMON-2: Remove legacy code
Modified: components/common/trunk/common/src/main/java/org/gatein/common/util/Tools.java
===================================================================
--- components/common/trunk/common/src/main/java/org/gatein/common/util/Tools.java 2009-08-25 21:13:58 UTC (rev 63)
+++ components/common/trunk/common/src/main/java/org/gatein/common/util/Tools.java 2009-08-25 21:24:14 UTC (rev 64)
@@ -24,7 +24,6 @@
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.gatein.common.logging.Log4JWriter;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -750,18 +749,6 @@
pw.flush();
}
- public static void dumpClassLoaderHierarchyInfo(Logger log, ClassLoader loader)
- {
- Writer writer = new Log4JWriter(log, Level.DEBUG);
- dumpClassLoaderHierarchyInfo(writer, loader);
- }
-
- public static void dumpClassLoaderHierarchyInfo(Logger log, Level level, ClassLoader loader)
- {
- Writer writer = new Log4JWriter(log, level);
- dumpClassLoaderHierarchyInfo(writer, loader);
- }
-
/**
* Replace occurence in a string.
*
Copied: components/common/trunk/common/src/test/java/org/gatein/common/ExtendedAssert.java (from rev 50, components/common/trunk/common/src/main/java/org/gatein/common/junit/ExtendedAssert.java)
===================================================================
--- components/common/trunk/common/src/test/java/org/gatein/common/ExtendedAssert.java (rev 0)
+++ components/common/trunk/common/src/test/java/org/gatein/common/ExtendedAssert.java 2009-08-25 21:24:14 UTC (rev 64)
@@ -0,0 +1,248 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2009, 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.gatein.common;
+
+import junit.framework.Assert;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Add more assert methods.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 7374 $
+ */
+@SuppressWarnings("unchecked")
+public class ExtendedAssert extends Assert
+{
+
+ /** @see #assertEquals(Object[],Object[]) */
+ public static void assertEquals(Object[] expected, Object[] actual)
+ {
+ assertEquals(null, expected, actual);
+ }
+
+ /** Test equality as defined by java.util.Array#equals(Object[], Object[]). */
+ public static void assertEquals(String message, Object[] expected, Object[] actual)
+ {
+ if (Arrays.equals(expected, actual))
+ {
+ return;
+ }
+ fail(format(message, expected, actual));
+ }
+
+ /** @see #assertEquals(char[],char[]) */
+ public static void assertEquals(char[] expected, char[] actual)
+ {
+ assertEquals(null, expected, actual);
+ }
+
+ /** Test equality as defined by java.util.Array#equals(char[], char[]). */
+ public static void assertEquals(String message, char[] expected, char[] actual)
+ {
+ if (Arrays.equals(expected, actual))
+ {
+ return;
+ }
+ fail(format(message, expected, actual));
+ }
+
+ /** @see #assertEquals(byte[],byte[]) */
+ public static void assertEquals(byte[] expected, byte[] actual)
+ {
+ assertEquals(null, expected, actual);
+ }
+
+ /** Test equality as defined by java.util.Array#equals(char[], char[]). */
+ public static void assertEquals(String message, byte[] expected, byte[] actual)
+ {
+ if (Arrays.equals(expected, actual))
+ {
+ return;
+ }
+
+ //
+ fail(format(message, toString(expected), toString(actual)));
+ }
+
+ private static String toString(byte[] expected)
+ {
+ StringBuffer expectedBuffer = new StringBuffer("[");
+
+ //
+ for (byte expectedByte : expected)
+ {
+ expectedBuffer.append(expectedByte).append(',');
+ }
+
+ //
+ if (expectedBuffer.length() == 1)
+ {
+ expectedBuffer.append(']');
+ }
+ else
+ {
+ expectedBuffer.setCharAt(expectedBuffer.length(), ']');
+ }
+
+ //
+ return expectedBuffer.toString();
+ }
+
+ private static String format(String message, Object expected, Object actual)
+ {
+ String formatted = "";
+ if (message != null)
+ {
+ formatted = message + " ";
+ }
+ return formatted + "expected:<" + format(expected) + "> but was:<" + format(actual) + ">";
+ }
+
+ private static String format(Object o)
+ {
+ if (o instanceof Object[])
+ {
+ Object[] array = (Object[])o;
+ StringBuffer buffer = new StringBuffer("[");
+ for (int i = 0; i < array.length; i++)
+ {
+ buffer.append(i == 0 ? "" : ",").append(String.valueOf(array[i]));
+ }
+ buffer.append("]");
+ return buffer.toString();
+ }
+ else
+ {
+ return String.valueOf(o);
+ }
+ }
+
+ public static void assertEquals(Object[] expected, Object[] tested, boolean isOrderRelevant, String failMessage)
+ {
+ if (isOrderRelevant)
+ {
+ if (!Arrays.equals(expected, tested))
+ {
+ fail(failMessage);
+ }
+ }
+ else
+ {
+ boolean equals = (expected == tested);
+
+ if (!equals)
+ {
+ if (expected == null || tested == null)
+ {
+ fail(failMessage + " Not both null.");
+ }
+
+ if (expected.getClass().getComponentType() != tested.getClass().getComponentType())
+ {
+ fail(failMessage + " Different classes.");
+ }
+
+ if (expected.length != tested.length)
+ {
+ fail(failMessage + " Different sizes (tested: " + tested.length + ", expected: " + expected.length + ").");
+ }
+
+ List expectedList = Arrays.asList(expected);
+ List testedList = Arrays.asList(tested);
+ if (!expectedList.containsAll(testedList))
+ {
+ fail(failMessage);
+ }
+ }
+ }
+ }
+
+ public static void assertEquals(Object[] expected, Object[] tested, boolean isOrderRelevant, String failMessage, Decorator decorator)
+ {
+ Object[] decoratedExpected = null, decoratedTested = null;
+ if (decorator != null)
+ {
+ decoratedExpected = decorate(expected, decorator);
+ decoratedTested = decorate(tested, decorator);
+ }
+
+ assertEquals(decoratedExpected, decoratedTested, isOrderRelevant, failMessage);
+ }
+
+ public static Object[] decorate(Object[] toBeDecorated, Decorator decorator)
+ {
+ if (toBeDecorated != null)
+ {
+ DecoratedObject[] decorated = new DecoratedObject[toBeDecorated.length];
+ for (int i = 0; i < decorated.length; i++)
+ {
+ decorated[i] = new DecoratedObject(toBeDecorated[i], decorator);
+ }
+ return decorated;
+ }
+ return null;
+
+ }
+
+ public static void assertString1ContainsString2(String string1, String string2)
+ {
+ assertTrue("<" + string1 + "> does not contain <" + string2 + ">", string1.indexOf(string2) >= 0);
+ }
+
+ public static interface Decorator
+ {
+ void decorate(Object decorated);
+ }
+
+ public static class DecoratedObject
+ {
+ private Decorator decorator;
+ private Object decorated;
+
+ public Object getDecorated()
+ {
+ return decorated;
+ }
+
+ public DecoratedObject(Object decorated, Decorator decorator)
+ {
+ this.decorator = decorator;
+ this.decorated = decorated;
+ }
+
+ public boolean equals(Object obj)
+ {
+ decorator.decorate(decorated);
+ return decorator.equals(obj);
+ }
+
+ public String toString()
+ {
+ decorator.decorate(decorated);
+ return decorator.toString();
+ }
+ }
+}
Modified: components/common/trunk/common/src/test/java/org/gatein/common/ParameterMapTestCase.java
===================================================================
--- components/common/trunk/common/src/test/java/org/gatein/common/ParameterMapTestCase.java 2009-08-25 21:13:58 UTC (rev 63)
+++ components/common/trunk/common/src/test/java/org/gatein/common/ParameterMapTestCase.java 2009-08-25 21:24:14 UTC (rev 64)
@@ -25,7 +25,7 @@
import junit.framework.TestCase;
import org.gatein.common.util.ParameterMap;
import org.gatein.common.util.Tools;
-import org.gatein.common.junit.ExtendedAssert;
+import org.gatein.common.ExtendedAssert;
import org.gatein.common.io.IOTools;
import java.util.HashMap;
Deleted: components/common/trunk/common/src/test/java/org/gatein/common/PathMapperTestCase.java
===================================================================
--- components/common/trunk/common/src/test/java/org/gatein/common/PathMapperTestCase.java 2009-08-25 21:13:58 UTC (rev 63)
+++ components/common/trunk/common/src/test/java/org/gatein/common/PathMapperTestCase.java 2009-08-25 21:24:14 UTC (rev 64)
@@ -1,157 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2009, 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.gatein.common;
-
-import junit.framework.TestCase;
-import org.gatein.common.path.PathMapper;
-import org.gatein.common.path.PathMapperContext;
-import org.gatein.common.path.PathMapperResult;
-import org.gatein.common.path.SimplePathMapper;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 5448 $
- */
-@SuppressWarnings("unchecked")
-public class PathMapperTestCase extends TestCase
-{
-
- public PathMapperTestCase(String s)
- {
- super(s);
- }
-
- private PathMapper mapper;
-
- protected void setUp() throws Exception
- {
- mapper = new SimplePathMapper();
- }
-
- protected void tearDown() throws Exception
- {
- mapper = null;
- }
-
- public void testEmptyContext()
- {
- PathMapperContextImpl root = new PathMapperContextImpl(null);
-
- assertEquals(new PathMapperResult(null, null, null), mapper.map(root, null));
- assertEquals(new PathMapperResult(null, null, null), mapper.map(root, ""));
- assertEquals(new PathMapperResult(null, null, "/"), mapper.map(root, "/"));
- assertEquals(new PathMapperResult(null, null, "/"), mapper.map(root, "//"));
-
- assertEquals(new PathMapperResult(null, null, "/a"), mapper.map(root, "/a"));
- assertEquals(new PathMapperResult(null, null, "/a/"), mapper.map(root, "/a/"));
- assertEquals(new PathMapperResult(null, null, "/a/b"), mapper.map(root, "/a/b"));
- assertEquals(new PathMapperResult(null, null, "/a/b/"), mapper.map(root, "/a/b/"));
- assertEquals(new PathMapperResult(null, null, "/a/b/c"), mapper.map(root, "/a/b/c"));
- }
-
- public void testOneChild()
- {
- PathMapperContextImpl root = new PathMapperContextImpl(null);
- PathMapperContextImpl child = new PathMapperContextImpl(null);
- root.addChild("a", child);
-
- assertEquals(new PathMapperResult(null, null, null), mapper.map(root, null));
- assertEquals(new PathMapperResult(null, null, null), mapper.map(root, ""));
- assertEquals(new PathMapperResult(null, null, "/"), mapper.map(root, "/"));
- assertEquals(new PathMapperResult(null, null, "/"), mapper.map(root, "//"));
-
- assertEquals(new PathMapperResult(child, "/a", null), mapper.map(root, "/a"));
- assertEquals(new PathMapperResult(child, "/a", "/"), mapper.map(root, "/a/"));
- assertEquals(new PathMapperResult(child, "/a", "/b"), mapper.map(root, "/a/b"));
- assertEquals(new PathMapperResult(child, "/a", "/b/"), mapper.map(root, "/a/b/"));
- assertEquals(new PathMapperResult(child, "/a", "/b/c"), mapper.map(root, "/a/b/c"));
-
- assertEquals(new PathMapperResult(null, null, "/b"), mapper.map(root, "/b"));
- assertEquals(new PathMapperResult(null, null, "/b/"), mapper.map(root, "/b/"));
- assertEquals(new PathMapperResult(null, null, "/b/c"), mapper.map(root, "/b/c"));
- assertEquals(new PathMapperResult(null, null, "/b/c/"), mapper.map(root, "/b/c/"));
- assertEquals(new PathMapperResult(null, null, "/b/c/d"), mapper.map(root, "/b/c/d"));
- }
-
- public void testOneChildHavingOneChild()
- {
- PathMapperContextImpl root = new PathMapperContextImpl(null);
- PathMapperContextImpl child = new PathMapperContextImpl(null);
- PathMapperContextImpl childOfChild = new PathMapperContextImpl(null);
- root.addChild("a", child);
- child.addChild("b", childOfChild);
-
- assertEquals(new PathMapperResult(null, null, null), mapper.map(root, null));
- assertEquals(new PathMapperResult(null, null, null), mapper.map(root, ""));
- assertEquals(new PathMapperResult(null, null, "/"), mapper.map(root, "/"));
- assertEquals(new PathMapperResult(null, null, "/"), mapper.map(root, "//"));
-
- assertEquals(new PathMapperResult(child, "/a", null), mapper.map(root, "/a"));
- assertEquals(new PathMapperResult(child, "/a", "/"), mapper.map(root, "/a/"));
- assertEquals(new PathMapperResult(childOfChild, "/a/b", null), mapper.map(root, "/a/b"));
- assertEquals(new PathMapperResult(child, "/a", "/b/"), mapper.map(root, "/a/b/"));
- assertEquals(new PathMapperResult(child, "/a", "/b/c"), mapper.map(root, "/a/b/c"));
-
- assertEquals(new PathMapperResult(null, null, "/b"), mapper.map(root, "/b"));
- assertEquals(new PathMapperResult(null, null, "/b/"), mapper.map(root, "/b/"));
- assertEquals(new PathMapperResult(null, null, "/b/c"), mapper.map(root, "/b/c"));
- assertEquals(new PathMapperResult(null, null, "/b/c/"), mapper.map(root, "/b/c/"));
- assertEquals(new PathMapperResult(null, null, "/b/c/d"), mapper.map(root, "/b/c/d"));
- }
-
- private static class Context
- {
- private final Map children;
-
- public Context(Object dflt)
- {
- children = new HashMap();
- }
-
- public void addChild(String name, Object child)
- {
- children.put(name, child);
- }
- }
-
- private static class PathMapperContextImpl extends Context implements PathMapperContext
- {
- public PathMapperContextImpl(Object dflt)
- {
- super(dflt);
- }
-
- public Object getRoot()
- {
- return this;
- }
-
- public Object getChild(Object parent, String name)
- {
- return ((Context)parent).children.get(name);
- }
- }
-}
Deleted: components/common/trunk/common/src/test/java/org/gatein/common/PathTestCase.java
===================================================================
--- components/common/trunk/common/src/test/java/org/gatein/common/PathTestCase.java 2009-08-25 21:13:58 UTC (rev 63)
+++ components/common/trunk/common/src/test/java/org/gatein/common/PathTestCase.java 2009-08-25 21:24:14 UTC (rev 64)
@@ -1,80 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2009, 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.gatein.common;
-
-import junit.framework.TestCase;
-import org.gatein.common.path.RelativePathParser;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 5451 $
- */
-public class PathTestCase extends TestCase
-{
-
- public void testSimpleDown()
- {
- String[] paths = {"abc","abc/","abc/."};
- for (int i = 0; i < paths.length; i++)
- {
- String path = paths[i];
- RelativePathParser cursor = new RelativePathParser(path);
- assertEquals(RelativePathParser.DOWN, cursor.next());
- assertEquals(0, cursor.getOffset());
- assertEquals(3, cursor.getLength());
- assertEquals("abc", path.substring(cursor.getOffset(), cursor.getLength()));
- assertEquals(RelativePathParser.NONE, cursor.next());
- assertEquals(-1, cursor.getOffset());
- assertEquals(-1, cursor.getLength());
- }
- }
-
- public void testSimpleNone()
- {
- String[] paths = {"",".","./","./."};
- for (int i = 0; i < paths.length; i++)
- {
- String path = paths[i];
- RelativePathParser cursor = new RelativePathParser(path);
- assertEquals(RelativePathParser.NONE, cursor.next());
- assertEquals(-1, cursor.getOffset());
- assertEquals(-1, cursor.getLength());
- }
- }
-
- public void testSimpleUp()
- {
- String[] paths = {"..","../","../."};
- for (int i = 0; i < paths.length; i++)
- {
- String path = paths[i];
- RelativePathParser cursor = new RelativePathParser(path);
- assertEquals(RelativePathParser.UP, cursor.next());
- assertEquals(-1, cursor.getOffset());
- assertEquals(-1, cursor.getLength());
- assertEquals(RelativePathParser.NONE, cursor.next());
- assertEquals(-1, cursor.getOffset());
- assertEquals(-1, cursor.getLength());
- }
- }
-}
Modified: components/common/trunk/common/src/test/java/org/gatein/common/ToolsTestCase.java
===================================================================
--- components/common/trunk/common/src/test/java/org/gatein/common/ToolsTestCase.java 2009-08-25 21:13:58 UTC (rev 63)
+++ components/common/trunk/common/src/test/java/org/gatein/common/ToolsTestCase.java 2009-08-25 21:24:14 UTC (rev 64)
@@ -24,7 +24,7 @@
package org.gatein.common;
import junit.framework.TestCase;
-import org.gatein.common.junit.ExtendedAssert;
+import org.gatein.common.ExtendedAssert;
import org.gatein.common.util.Tools;
import java.util.ArrayList;
Modified: components/common/trunk/common/src/test/java/org/gatein/common/io/IOToolsTestCase.java
===================================================================
--- components/common/trunk/common/src/test/java/org/gatein/common/io/IOToolsTestCase.java 2009-08-25 21:13:58 UTC (rev 63)
+++ components/common/trunk/common/src/test/java/org/gatein/common/io/IOToolsTestCase.java 2009-08-25 21:24:14 UTC (rev 64)
@@ -23,7 +23,7 @@
package org.gatein.common.io;
import org.gatein.common.io.IOTools;
-import org.gatein.common.junit.ExtendedAssert;
+import org.gatein.common.ExtendedAssert;
import junit.framework.TestCase;
import java.io.OutputStream;
Modified: components/common/trunk/common/src/test/java/org/gatein/common/io/SerializationTestCase.java
===================================================================
--- components/common/trunk/common/src/test/java/org/gatein/common/io/SerializationTestCase.java 2009-08-25 21:13:58 UTC (rev 63)
+++ components/common/trunk/common/src/test/java/org/gatein/common/io/SerializationTestCase.java 2009-08-25 21:24:14 UTC (rev 64)
@@ -24,7 +24,7 @@
import org.gatein.common.io.Serialization;
import org.gatein.common.io.IOTools;
-import org.gatein.common.junit.ExtendedAssert;
+import org.gatein.common.ExtendedAssert;
import org.gatein.common.util.MapBuilder;
import java.util.Map;
Modified: components/common/trunk/common/src/test/java/org/gatein/common/net/AbstractSynchronizedServer.java
===================================================================
--- components/common/trunk/common/src/test/java/org/gatein/common/net/AbstractSynchronizedServer.java 2009-08-25 21:13:58 UTC (rev 63)
+++ components/common/trunk/common/src/test/java/org/gatein/common/net/AbstractSynchronizedServer.java 2009-08-25 21:24:14 UTC (rev 64)
@@ -23,7 +23,7 @@
package org.gatein.common.net;
import org.apache.log4j.Logger;
-import org.gatein.common.junit.ExtendedAssert;
+import org.gatein.common.ExtendedAssert;
import java.net.ServerSocket;
import java.net.Socket;
Modified: components/common/trunk/common/src/test/java/org/gatein/common/net/URLToolsTestCase.java
===================================================================
--- components/common/trunk/common/src/test/java/org/gatein/common/net/URLToolsTestCase.java 2009-08-25 21:13:58 UTC (rev 63)
+++ components/common/trunk/common/src/test/java/org/gatein/common/net/URLToolsTestCase.java 2009-08-25 21:24:14 UTC (rev 64)
@@ -24,7 +24,7 @@
import junit.framework.TestCase;
import org.apache.log4j.Logger;
-import org.gatein.common.junit.ExtendedAssert;
+import org.gatein.common.ExtendedAssert;
import org.gatein.common.net.URLTools;
import java.net.MalformedURLException;
15 years, 4 months
- 1
- 0
gatein SVN: r63 - in components/mop/trunk: api and 3 other directories.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-08-25 17:13:58 -0400 (Tue, 25 Aug 2009)
New Revision: 63
Modified:
components/mop/trunk/
components/mop/trunk/api/
components/mop/trunk/core/
components/mop/trunk/parent/
components/mop/trunk/spi/
Log:
ignore generated files and dir produced by maven and eclipse
Property changes on: components/mop/trunk
___________________________________________________________________
Name: svn:ignore
+ .settings
.project
Property changes on: components/mop/trunk/api
___________________________________________________________________
Name: svn:ignore
+ .settings
target
.classpath
.project
Property changes on: components/mop/trunk/core
___________________________________________________________________
Name: svn:ignore
+ .settings
target
.classpath
.project
nul
Property changes on: components/mop/trunk/parent
___________________________________________________________________
Name: svn:ignore
+ .settings
.project
Property changes on: components/mop/trunk/spi
___________________________________________________________________
Name: svn:ignore
+ .settings
target
.classpath
.project
15 years, 4 months
- 1
- 0
gatein SVN: r62 - in components: common/trunk/common/src/test/java/org/gatein/common and 8 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-08-25 17:10:18 -0400 (Tue, 25 Aug 2009)
New Revision: 62
Added:
components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/AttributeResolver.java
components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/InvocationException.java
components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/resolver/
components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/resolver/AbstractSessionAttributeResolver.java
components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/resolver/MapAttributeResolver.java
components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/resolver/PrincipalAttributeResolver.java
Removed:
components/common/trunk/common/src/main/java/org/gatein/common/invocation/
components/common/trunk/common/src/test/java/org/gatein/common/AbstractInvocationContextTestCase.java
Modified:
components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/PortletInvocation.java
components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatedPortletInvokerService.java
components/pc/trunk/pc/src/main/java/org/gatein/pc/container/ContainerPortletInvoker.java
components/pc/trunk/pc/src/main/java/org/gatein/pc/container/PortletContainer.java
components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/jsr168/PortletContainerImpl.java
components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/spi/AbstractUserContext.java
components/pc/trunk/pc/src/main/java/org/gatein/pc/state/producer/PortletStateChangeRequiredException.java
components/pc/trunk/pc/src/main/java/org/gatein/pc/state/producer/ProducerPortletInvoker.java
components/pc/trunk/pc/src/test/java/org/gatein/pc/container/PortletContainerObjectSupport.java
Log:
GTNPC-1 : Use classes from package org.gatein.common.invocation
GTNCOMMON-1 : Move org.gatein.common.invocation package to PC
Deleted: components/common/trunk/common/src/test/java/org/gatein/common/AbstractInvocationContextTestCase.java
===================================================================
--- components/common/trunk/common/src/test/java/org/gatein/common/AbstractInvocationContextTestCase.java 2009-08-25 20:44:04 UTC (rev 61)
+++ components/common/trunk/common/src/test/java/org/gatein/common/AbstractInvocationContextTestCase.java 2009-08-25 21:10:18 UTC (rev 62)
@@ -1,254 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2009, 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.gatein.common;
-
-import junit.framework.TestCase;
-import org.gatein.common.invocation.AbstractInvocationContext;
-import org.gatein.common.invocation.Scope;
-import org.gatein.common.invocation.AttributeResolver;
-
-import java.util.HashMap;
-import java.util.Set;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-@SuppressWarnings("unchecked")
-public class AbstractInvocationContextTestCase extends TestCase
-{
-
- /** . */
- private static final Scope TEST_SCOPE = new Scope("test");
-
- public void testNonExistingScope()
- {
- AbstractInvocationContext ctx = new AbstractInvocationContext();
- try
- {
- ctx.getAttribute(TEST_SCOPE, "foo");
- fail("was expecting an IllegalArgumentException");
- }
- catch (IllegalArgumentException expected)
- {
-
- }
- try
- {
- ctx.setAttribute(TEST_SCOPE, "foo", "bar");
- fail("was expecting an IllegalArgumentException");
- }
- catch (IllegalArgumentException expected)
- {
-
- }
- try
- {
- ctx.removeAttribute(TEST_SCOPE, "foo");
- fail("was expecting an IllegalArgumentException");
- }
- catch (IllegalArgumentException expected)
- {
-
- }
- try
- {
- ctx.getAttributeResolver(TEST_SCOPE);
- fail("was expecting an IllegalArgumentException");
- }
- catch (IllegalArgumentException expected)
- {
-
- }
- }
-
- public void testExistingScopeWithResolver()
- {
- final MapResolver resolver = new MapResolver();
- AbstractInvocationContext ctx = new AbstractInvocationContext()
- {
- {
- addResolver(TEST_SCOPE, resolver);
- }
- };
- testExistingScope(ctx, resolver);
- }
-
- public void testExistingScopeDelegation()
- {
- final MapResolver resolver = new MapResolver();
- final AbstractInvocationContext parent = new AbstractInvocationContext()
- {
- {
- addResolver(TEST_SCOPE, resolver);
- }
- };
- AbstractInvocationContext child = new AbstractInvocationContext()
- {
- {
- addResolver(TEST_SCOPE, parent);
- }
- };
- testExistingScope(child, resolver);
- }
-
-
- private void testExistingScope(AbstractInvocationContext ctx, MapResolver resolver)
- {
- // Assert empty does not exist
- assertNull(ctx.getAttribute(TEST_SCOPE, "foo"));
- assertEquals(0, resolver.size());
-
- // Remove non existing
- ctx.removeAttribute(TEST_SCOPE, "foo");
- assertNull(ctx.getAttribute(TEST_SCOPE, "foo"));
- assertEquals(0, resolver.size());
-
- // Set non existing
- ctx.setAttribute(TEST_SCOPE, "foo", "bar");
- assertEquals("bar", resolver.getAttribute("foo"));
- assertEquals(1, resolver.size());
-
- // Overwrite existing
- ctx.setAttribute(TEST_SCOPE, "foo", "bar2");
- assertEquals("bar2", resolver.getAttribute("foo"));
- assertEquals(1, resolver.size());
-
- // Remove existing
- ctx.removeAttribute(TEST_SCOPE, "foo");
- assertNull(ctx.getAttribute(TEST_SCOPE, "foo"));
- assertEquals(0, resolver.size());
-
- // Get resolver
- assertEquals(resolver, ctx.getAttributeResolver(TEST_SCOPE));
- }
-
- public void testAPI()
- {
- AbstractInvocationContext ctx = new AbstractInvocationContext();
- try
- {
- ctx.getAttribute(null, "foo");
- fail("was expecting an IllegalArgumentException");
- }
- catch (IllegalArgumentException expected)
- {
- }
- try
- {
- ctx.getAttribute(TEST_SCOPE, null);
- fail("was expecting an IllegalArgumentException");
- }
- catch (IllegalArgumentException expected)
- {
- }
- try
- {
- ctx.setAttribute(null, "foo", "bar");
- fail("was expecting an IllegalArgumentException");
- }
- catch (IllegalArgumentException expected)
- {
- }
- try
- {
- ctx.setAttribute(TEST_SCOPE, null, "bar");
- fail("was expecting an IllegalArgumentException");
- }
- catch (IllegalArgumentException expected)
- {
- }
- try
- {
- ctx.setAttribute(null, "foo", null);
- fail("was expecting an IllegalArgumentException");
- }
- catch (IllegalArgumentException expected)
- {
- }
- try
- {
- ctx.setAttribute(TEST_SCOPE, null, null);
- fail("was expecting an IllegalArgumentException");
- }
- catch (IllegalArgumentException expected)
- {
- }
- try
- {
- ctx.removeAttribute(null, "foo");
- fail("was expecting an IllegalArgumentException");
- }
- catch (IllegalArgumentException expected)
- {
- }
- try
- {
- ctx.removeAttribute(TEST_SCOPE, null);
- fail("was expecting an IllegalArgumentException");
- }
- catch (IllegalArgumentException expected)
- {
- }
- try
- {
- ctx.getAttributeResolver(null);
- fail("was expecting an IllegalArgumentException");
- }
- catch (IllegalArgumentException expected)
- {
- }
- }
-
- @SuppressWarnings("serial")
- private static class MapResolver extends HashMap implements AttributeResolver
- {
- public Set getKeys()
- {
- return keySet();
- }
- public Object getAttribute(Object attrKey) throws IllegalArgumentException
- {
- if (attrKey == null)
- {
- throw new IllegalArgumentException();
- }
- return get(attrKey);
- }
- public void setAttribute(Object attrKey, Object attrValue) throws IllegalArgumentException
- {
- if (attrKey == null)
- {
- throw new IllegalArgumentException();
- }
- if (attrValue != null)
- {
- put(attrKey, attrValue);
- }
- else
- {
- remove(attrKey);
- }
- }
- }
-}
Added: components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/AttributeResolver.java
===================================================================
--- components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/AttributeResolver.java (rev 0)
+++ components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/AttributeResolver.java 2009-08-25 21:10:18 UTC (rev 62)
@@ -0,0 +1,60 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2009, 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.gatein.pc.api.invocation;
+
+import java.util.Set;
+
+/**
+ * An attribute resolver.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 7228 $
+ */
+public interface AttributeResolver<K, V>
+{
+ /**
+ * Returns the set of keys of the attributes bound in that resolver.
+ *
+ * @return a set of keys
+ */
+ Set<K> getKeys();
+
+ /**
+ * Return an attribute from this resolver.
+ *
+ * @param attrKey
+ * @return the attribute value or null if it is not found
+ * @throws IllegalArgumentException if the attribute key is not valid
+ */
+ V getAttribute(K attrKey) throws IllegalArgumentException;
+
+ /**
+ * Update an attribute value on this resolve. If the attribute value is null the resolver must treat the operation as
+ * a removal of the attribute.
+ *
+ * @param attrKey
+ * @param attrValue the attribute value
+ * @throws IllegalArgumentException if the attribute key is not valid
+ */
+ void setAttribute(K attrKey, V attrValue) throws IllegalArgumentException;
+}
Added: components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/InvocationException.java
===================================================================
--- components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/InvocationException.java (rev 0)
+++ components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/InvocationException.java 2009-08-25 21:10:18 UTC (rev 62)
@@ -0,0 +1,53 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2009, 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.gatein.pc.api.invocation;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 5451 $
+ */
+public class InvocationException extends RuntimeException
+{
+
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 7607329736844391861L;
+
+ public InvocationException()
+ {
+ }
+
+ public InvocationException(String message)
+ {
+ super(message);
+ }
+
+ public InvocationException(Throwable cause)
+ {
+ super(cause);
+ }
+
+ public InvocationException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+}
Modified: components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/PortletInvocation.java
===================================================================
--- components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/PortletInvocation.java 2009-08-25 20:44:04 UTC (rev 61)
+++ components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/PortletInvocation.java 2009-08-25 21:10:18 UTC (rev 62)
@@ -22,8 +22,7 @@
******************************************************************************/
package org.gatein.pc.api.invocation;
-import org.gatein.common.invocation.AttributeResolver;
-import org.gatein.common.invocation.resolver.MapAttributeResolver;
+import org.gatein.pc.api.invocation.resolver.MapAttributeResolver;
import org.gatein.pc.api.spi.InstanceContext;
import org.gatein.pc.api.spi.PortalContext;
import org.gatein.pc.api.spi.PortletInvocationContext;
Added: components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/resolver/AbstractSessionAttributeResolver.java
===================================================================
--- components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/resolver/AbstractSessionAttributeResolver.java (rev 0)
+++ components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/resolver/AbstractSessionAttributeResolver.java 2009-08-25 21:10:18 UTC (rev 62)
@@ -0,0 +1,142 @@
+/******************************************************************************
+ * 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.gatein.pc.api.invocation.resolver;
+
+import org.gatein.pc.api.invocation.AttributeResolver;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 7228 $
+ */
+public abstract class AbstractSessionAttributeResolver implements AttributeResolver
+{
+
+ /** . */
+ protected final HttpServletRequest req;
+
+ public AbstractSessionAttributeResolver(HttpServletRequest req)
+ {
+ if (req == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ this.req = req;
+ }
+
+
+ public Set getKeys()
+ {
+ Map map = getMap(false);
+
+ //
+ if (map != null)
+ {
+ return map.keySet();
+ }
+ else
+ {
+ return Collections.EMPTY_SET;
+ }
+ }
+
+ public Object getAttribute(Object attrKey) throws IllegalArgumentException
+ {
+ if (attrKey == null)
+ {
+ throw new IllegalArgumentException();
+ }
+
+ //
+ Object value = null;
+ Map map = getMap(false);
+ if (map != null)
+ {
+ value = map.get(attrKey);
+ }
+ return value;
+ }
+
+ public void setAttribute(Object attrKey, Object attrValue) throws IllegalArgumentException
+ {
+ if (attrKey == null)
+ {
+ throw new IllegalArgumentException();
+ }
+
+ //
+ Map map = getMap(false);
+ if (map != null)
+ {
+ if (attrValue != null)
+ {
+ map.put(attrKey, attrValue);
+ }
+ else
+ {
+ map.remove(attrKey);
+ }
+ }
+ else
+ {
+ if (attrValue != null)
+ {
+ map = getMap(true);
+ map.put(attrKey, attrValue);
+ }
+ }
+ }
+
+ protected abstract String getMapKey();
+
+ protected Map createMap(String mapKey)
+ {
+ return new HashMap();
+ }
+
+ private Map getMap(boolean create)
+ {
+ HttpSession session = req.getSession(create);
+ if (session != null)
+ {
+ String mapKey = getMapKey();
+ Map map = (Map)session.getAttribute(mapKey);
+ if (map == null)
+ {
+ map = createMap(mapKey);
+ session.setAttribute(mapKey, map);
+ }
+ return map;
+ }
+ else
+ {
+ return null;
+ }
+ }
+}
\ No newline at end of file
Added: components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/resolver/MapAttributeResolver.java
===================================================================
--- components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/resolver/MapAttributeResolver.java (rev 0)
+++ components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/resolver/MapAttributeResolver.java 2009-08-25 21:10:18 UTC (rev 62)
@@ -0,0 +1,86 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2009, 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.gatein.pc.api.invocation.resolver;
+
+import org.gatein.pc.api.invocation.AttributeResolver;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 7228 $
+ */
+@SuppressWarnings("unchecked")
+public class MapAttributeResolver implements AttributeResolver
+{
+
+ /** . */
+ private final Map attributes;
+
+ public MapAttributeResolver(Map attributes)
+ {
+ if (attributes == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ this.attributes = attributes;
+ }
+
+ public MapAttributeResolver()
+ {
+ this(new HashMap());
+ }
+
+
+ public Set getKeys()
+ {
+ return attributes.keySet();
+ }
+
+ public Object getAttribute(Object attrKey) throws IllegalArgumentException
+ {
+ if (attrKey == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ return attributes.get(attrKey);
+ }
+
+ public void setAttribute(Object attrKey, Object attrValue) throws IllegalArgumentException
+ {
+ if (attrKey == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ if (attrValue != null)
+ {
+ attributes.put(attrKey, attrValue);
+ }
+ else
+ {
+ attributes.remove(attrKey);
+ }
+ }
+}
Added: components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/resolver/PrincipalAttributeResolver.java
===================================================================
--- components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/resolver/PrincipalAttributeResolver.java (rev 0)
+++ components/pc/trunk/api/src/main/java/org/gatein/pc/api/invocation/resolver/PrincipalAttributeResolver.java 2009-08-25 21:10:18 UTC (rev 62)
@@ -0,0 +1,87 @@
+/******************************************************************************
+ * 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.gatein.pc.api.invocation.resolver;
+
+import javax.servlet.http.HttpServletRequest;
+import java.security.Principal;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 7228 $
+ */
+public class PrincipalAttributeResolver extends AbstractSessionAttributeResolver
+{
+
+ /** . */
+ private String cachedPrincipalName;
+
+ /** . */
+ private String cachedMapKey;
+
+ public PrincipalAttributeResolver(HttpServletRequest req)
+ {
+ super(req);
+ }
+
+ protected String getMapKey()
+ {
+ Principal principal = req.getUserPrincipal();
+
+ //
+ if (cachedMapKey != null)
+ {
+ if (cachedPrincipalName == null)
+ {
+ if (principal != null)
+ {
+ cachedMapKey = null;
+ }
+ }
+ else
+ {
+ if (principal == null || (cachedPrincipalName.equals(principal.getName()) == false))
+ {
+ cachedMapKey = null;
+ }
+ }
+ }
+
+ //
+ if (cachedMapKey == null)
+ {
+ if (principal == null)
+ {
+ cachedMapKey = "portal.principal";
+ cachedPrincipalName = null;
+ }
+ else
+ {
+ cachedMapKey = "portal.principal." + principal.getName();
+ cachedPrincipalName = principal.getName();
+ }
+ }
+
+ //
+ return cachedMapKey;
+ }
+}
\ No newline at end of file
Modified: components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatedPortletInvokerService.java
===================================================================
--- components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatedPortletInvokerService.java 2009-08-25 20:44:04 UTC (rev 61)
+++ components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatedPortletInvokerService.java 2009-08-25 21:10:18 UTC (rev 62)
@@ -22,7 +22,6 @@
******************************************************************************/
package org.gatein.pc.federation.impl;
-import org.gatein.common.invocation.InvocationException;
import org.gatein.pc.federation.FederatedPortletInvoker;
import org.gatein.pc.federation.FederatingPortletInvoker;
import org.gatein.pc.api.Portlet;
@@ -139,7 +138,7 @@
}
}
- public PortletInvocationResponse invoke(PortletInvocation invocation) throws InvocationException, PortletInvokerException
+ public PortletInvocationResponse invoke(PortletInvocation invocation) throws org.gatein.pc.api.invocation.InvocationException, PortletInvokerException
{
PortletContext compoundPortletContext = invocation.getTarget();
PortletContext portletContext = dereference(compoundPortletContext);
Modified: components/pc/trunk/pc/src/main/java/org/gatein/pc/container/ContainerPortletInvoker.java
===================================================================
--- components/pc/trunk/pc/src/main/java/org/gatein/pc/container/ContainerPortletInvoker.java 2009-08-25 20:44:04 UTC (rev 61)
+++ components/pc/trunk/pc/src/main/java/org/gatein/pc/container/ContainerPortletInvoker.java 2009-08-25 21:10:18 UTC (rev 62)
@@ -22,7 +22,6 @@
******************************************************************************/
package org.gatein.pc.container;
-import org.gatein.common.invocation.InvocationException;
import org.gatein.pc.api.NoSuchPortletException;
import org.gatein.pc.api.Portlet;
import org.gatein.pc.api.PortletContext;
@@ -101,7 +100,7 @@
return portlet;
}
- public PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException, InvocationException
+ public PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException, org.gatein.pc.api.invocation.InvocationException
{
// Get portlet container
PortletContext ctx = invocation.getTarget();
Modified: components/pc/trunk/pc/src/main/java/org/gatein/pc/container/PortletContainer.java
===================================================================
--- components/pc/trunk/pc/src/main/java/org/gatein/pc/container/PortletContainer.java 2009-08-25 20:44:04 UTC (rev 61)
+++ components/pc/trunk/pc/src/main/java/org/gatein/pc/container/PortletContainer.java 2009-08-25 21:10:18 UTC (rev 62)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.gatein.pc.container;
-import org.gatein.common.invocation.InvocationException;
+import org.gatein.pc.api.invocation.InvocationException;
import org.gatein.pc.api.PortletInvokerException;
import org.gatein.pc.api.info.PortletInfo;
import org.gatein.pc.api.invocation.PortletInvocation;
@@ -57,7 +57,7 @@
* @throws org.gatein.pc.api.PortletInvokerException a portlet invoker exception
* @throws InvocationException an invocation exception
*/
- PortletInvocationResponse dispatch(PortletInvocation invocation) throws PortletInvokerException, InvocationException;
+ PortletInvocationResponse dispatch(PortletInvocation invocation) throws PortletInvokerException, org.gatein.pc.api.invocation.InvocationException;
/**
* Returns the wired application.
Modified: components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/jsr168/PortletContainerImpl.java
===================================================================
--- components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/jsr168/PortletContainerImpl.java 2009-08-25 20:44:04 UTC (rev 61)
+++ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/jsr168/PortletContainerImpl.java 2009-08-25 21:10:18 UTC (rev 62)
@@ -24,7 +24,7 @@
import org.gatein.common.concurrent.Valve;
import org.gatein.common.i18n.ResourceBundleManager;
-import org.gatein.common.invocation.InvocationException;
+import org.gatein.pc.api.invocation.InvocationException;
import org.gatein.pc.api.PortletInvokerException;
import org.gatein.pc.aspects.portlet.ContextDispatcherInterceptor;
import org.gatein.pc.container.PortletApplication;
@@ -490,7 +490,7 @@
}
else
{
- throw new InvocationException("Unexpected invocation " + invocation);
+ throw new org.gatein.pc.api.invocation.InvocationException("Unexpected invocation " + invocation);
}
//
Modified: components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/spi/AbstractUserContext.java
===================================================================
--- components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/spi/AbstractUserContext.java 2009-08-25 20:44:04 UTC (rev 61)
+++ components/pc/trunk/pc/src/main/java/org/gatein/pc/impl/spi/AbstractUserContext.java 2009-08-25 21:10:18 UTC (rev 62)
@@ -23,9 +23,9 @@
package org.gatein.pc.impl.spi;
import org.gatein.common.util.Tools;
-import org.gatein.common.invocation.resolver.PrincipalAttributeResolver;
-import org.gatein.common.invocation.resolver.MapAttributeResolver;
-import org.gatein.common.invocation.AttributeResolver;
+import org.gatein.pc.api.invocation.resolver.PrincipalAttributeResolver;
+import org.gatein.pc.api.invocation.resolver.MapAttributeResolver;
+import org.gatein.pc.api.invocation.AttributeResolver;
import org.gatein.pc.api.spi.UserContext;
import javax.servlet.http.HttpServletRequest;
Modified: components/pc/trunk/pc/src/main/java/org/gatein/pc/state/producer/PortletStateChangeRequiredException.java
===================================================================
--- components/pc/trunk/pc/src/main/java/org/gatein/pc/state/producer/PortletStateChangeRequiredException.java 2009-08-25 20:44:04 UTC (rev 61)
+++ components/pc/trunk/pc/src/main/java/org/gatein/pc/state/producer/PortletStateChangeRequiredException.java 2009-08-25 21:10:18 UTC (rev 62)
@@ -23,15 +23,13 @@
package org.gatein.pc.state.producer;
-import org.gatein.common.invocation.InvocationException;
-
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision: 5776 $
* @since 2.6
*/
@SuppressWarnings("serial")
-public class PortletStateChangeRequiredException extends InvocationException
+public class PortletStateChangeRequiredException extends org.gatein.pc.api.invocation.InvocationException
{
public PortletStateChangeRequiredException(String message)
{
Modified: components/pc/trunk/pc/src/main/java/org/gatein/pc/state/producer/ProducerPortletInvoker.java
===================================================================
--- components/pc/trunk/pc/src/main/java/org/gatein/pc/state/producer/ProducerPortletInvoker.java 2009-08-25 20:44:04 UTC (rev 61)
+++ components/pc/trunk/pc/src/main/java/org/gatein/pc/state/producer/ProducerPortletInvoker.java 2009-08-25 21:10:18 UTC (rev 62)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.gatein.pc.state.producer;
-import org.gatein.common.invocation.InvocationException;
+import org.gatein.pc.api.invocation.InvocationException;
import org.gatein.pc.api.InvalidPortletIdException;
import org.gatein.pc.api.NoSuchPortletException;
import org.gatein.pc.api.Portlet;
Modified: components/pc/trunk/pc/src/test/java/org/gatein/pc/container/PortletContainerObjectSupport.java
===================================================================
--- components/pc/trunk/pc/src/test/java/org/gatein/pc/container/PortletContainerObjectSupport.java 2009-08-25 20:44:04 UTC (rev 61)
+++ components/pc/trunk/pc/src/test/java/org/gatein/pc/container/PortletContainerObjectSupport.java 2009-08-25 21:10:18 UTC (rev 62)
@@ -27,7 +27,7 @@
import org.gatein.pc.api.invocation.response.PortletInvocationResponse;
import org.gatein.pc.api.invocation.PortletInvocation;
import org.gatein.pc.api.PortletInvokerException;
-import org.gatein.common.invocation.InvocationException;
+import org.gatein.pc.api.invocation.InvocationException;
import java.util.Map;
import java.util.HashMap;
15 years, 4 months
- 1
- 0
gatein SVN: r60 - in components/pc/trunk: federation/src/main/java/org/gatein/pc/federation/impl and 6 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-08-25 16:21:36 -0400 (Tue, 25 Aug 2009)
New Revision: 60
Modified:
components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletInvoker.java
components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatedPortletInvokerService.java
components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java
components/pc/trunk/pc/src/main/java/org/gatein/pc/PortletInvokerInterceptor.java
components/pc/trunk/pc/src/main/java/org/gatein/pc/container/ContainerPortletInvoker.java
components/pc/trunk/pc/src/main/java/org/gatein/pc/state/consumer/ConsumerPortletInvoker.java
components/pc/trunk/pc/src/main/java/org/gatein/pc/state/producer/ProducerPortletInvoker.java
components/pc/trunk/pc/src/test/java/org/gatein/pc/state/ConsumerStatefulPortletInvokerTestCase.java
components/pc/trunk/pc/src/test/java/org/gatein/pc/state/ProducerStatefulPortletInvokerTestCase.java
components/pc/trunk/pc/src/test/java/org/gatein/pc/support/PortletInvokerSupport.java
Log:
fix bugs in portlet state type
Modified: components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletInvoker.java
===================================================================
--- components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletInvoker.java 2009-08-25 20:17:52 UTC (rev 59)
+++ components/pc/trunk/api/src/main/java/org/gatein/pc/api/PortletInvoker.java 2009-08-25 20:21:36 UTC (rev 60)
@@ -69,13 +69,14 @@
/**
* Clone a portlet.
*
- * @param portletContext the portlet context to clone
- * @return the clone id
+ * @param stateType the portle state type desired
+ * @param portletContext the portlet context to clone @return the clone id
+ * @return the cloned portlet context
* @throws IllegalArgumentException if the portletId is null
* @throws UnsupportedOperationException if the invoker does not support this operation
* @throws PortletInvokerException a portlet invoker exception
*/
- PortletContext createClone(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException;
+ PortletContext createClone(PortletStateType stateType, PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException;
/**
* Destroy a cloned portlet.
Modified: components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatedPortletInvokerService.java
===================================================================
--- components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatedPortletInvokerService.java 2009-08-25 20:17:52 UTC (rev 59)
+++ components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatedPortletInvokerService.java 2009-08-25 20:21:36 UTC (rev 60)
@@ -157,10 +157,10 @@
}
}
- public PortletContext createClone(PortletContext compoundPortletContext) throws PortletInvokerException
+ public PortletContext createClone(PortletStateType stateType, PortletContext compoundPortletContext) throws PortletInvokerException
{
PortletContext portletContext = dereference(compoundPortletContext);
- PortletContext cloneContext = portletInvoker.createClone(portletContext);
+ PortletContext cloneContext = portletInvoker.createClone(stateType, portletContext);
return reference(cloneContext);
}
Modified: components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java
===================================================================
--- components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java 2009-08-25 20:17:52 UTC (rev 59)
+++ components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java 2009-08-25 20:21:36 UTC (rev 60)
@@ -30,6 +30,7 @@
import org.gatein.pc.api.PortletContext;
import org.gatein.pc.api.PortletInvoker;
import org.gatein.pc.api.PortletInvokerException;
+import org.gatein.pc.api.PortletStateType;
import org.gatein.pc.api.invocation.PortletInvocation;
import org.gatein.pc.api.invocation.response.PortletInvocationResponse;
import org.gatein.pc.api.state.DestroyCloneFailure;
@@ -154,10 +155,10 @@
return federated.invoke(invocation);
}
- public PortletContext createClone(PortletContext compoundPortletContext) throws PortletInvokerException
+ public PortletContext createClone(PortletStateType stateType, PortletContext compoundPortletContext) throws PortletInvokerException
{
FederatedPortletInvoker federated = getFederatedPortletInvokerFor(compoundPortletContext);
- return federated.createClone(compoundPortletContext);
+ return federated.createClone(stateType, compoundPortletContext);
}
public List<DestroyCloneFailure> destroyClones(List<PortletContext> portletContexts) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
@@ -278,9 +279,9 @@
return invoker.invoke(invocation);
}
- public PortletContext createClone(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ public PortletContext createClone(PortletStateType stateType, PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
{
- return invoker.createClone(portletContext);
+ return invoker.createClone(stateType, portletContext);
}
public List<DestroyCloneFailure> destroyClones(List<PortletContext> portletContexts) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
Modified: components/pc/trunk/pc/src/main/java/org/gatein/pc/PortletInvokerInterceptor.java
===================================================================
--- components/pc/trunk/pc/src/main/java/org/gatein/pc/PortletInvokerInterceptor.java 2009-08-25 20:17:52 UTC (rev 59)
+++ components/pc/trunk/pc/src/main/java/org/gatein/pc/PortletInvokerInterceptor.java 2009-08-25 20:21:36 UTC (rev 60)
@@ -31,6 +31,7 @@
import org.gatein.pc.api.PortletContext;
import org.gatein.pc.api.PortletInvokerException;
import org.gatein.pc.api.PortletInvoker;
+import org.gatein.pc.api.PortletStateType;
import java.util.Set;
import java.util.List;
@@ -86,9 +87,9 @@
return safeGetNext().invoke(invocation);
}
- public PortletContext createClone(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ public PortletContext createClone(PortletStateType stateType, PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
{
- return safeGetNext().createClone(portletContext);
+ return safeGetNext().createClone(stateType, portletContext);
}
public List<DestroyCloneFailure> destroyClones(List<PortletContext> portletContexts) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
Modified: components/pc/trunk/pc/src/main/java/org/gatein/pc/container/ContainerPortletInvoker.java
===================================================================
--- components/pc/trunk/pc/src/main/java/org/gatein/pc/container/ContainerPortletInvoker.java 2009-08-25 20:17:52 UTC (rev 59)
+++ components/pc/trunk/pc/src/main/java/org/gatein/pc/container/ContainerPortletInvoker.java 2009-08-25 20:21:36 UTC (rev 60)
@@ -27,6 +27,7 @@
import org.gatein.pc.api.Portlet;
import org.gatein.pc.api.PortletContext;
import org.gatein.pc.api.PortletInvokerException;
+import org.gatein.pc.api.PortletStateType;
import org.gatein.pc.api.state.PropertyMap;
import org.gatein.pc.impl.info.ContainerPreferencesInfo;
import org.gatein.pc.impl.info.ContainerPortletInfo;
@@ -178,7 +179,7 @@
return result;
}
- public PortletContext createClone(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ public PortletContext createClone(PortletStateType stateType, PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
{
throw new UnsupportedOperationException();
}
Modified: components/pc/trunk/pc/src/main/java/org/gatein/pc/state/consumer/ConsumerPortletInvoker.java
===================================================================
--- components/pc/trunk/pc/src/main/java/org/gatein/pc/state/consumer/ConsumerPortletInvoker.java 2009-08-25 20:17:52 UTC (rev 59)
+++ components/pc/trunk/pc/src/main/java/org/gatein/pc/state/consumer/ConsumerPortletInvoker.java 2009-08-25 20:21:36 UTC (rev 60)
@@ -174,9 +174,9 @@
if (modifiedContext != null)
{
// update state if needed
- if (clonedContext instanceof StatefulPortletContext)
+ if (modifiedContext instanceof StatefulPortletContext)
{
- StatefulPortletContext statefulClonedContext = (StatefulPortletContext)clonedContext;
+ StatefulPortletContext statefulClonedContext = (StatefulPortletContext)modifiedContext;
Serializable state = statefulClonedContext.getState();
PortletStateType stateType = statefulClonedContext.getType();
try
@@ -206,12 +206,12 @@
}
}
- public PortletContext createClone(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ public PortletContext createClone(PortletStateType stateType, PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
{
ConsumerContext consumerContext = getConsumerContext(portletContext);
//
- PortletContext clonedContext = super.createClone(consumerContext.producerPortletContext);
+ PortletContext clonedContext = super.createClone(stateType, consumerContext.producerPortletContext);
if (clonedContext instanceof StatefulPortletContext)
{
Modified: components/pc/trunk/pc/src/main/java/org/gatein/pc/state/producer/ProducerPortletInvoker.java
===================================================================
--- components/pc/trunk/pc/src/main/java/org/gatein/pc/state/producer/ProducerPortletInvoker.java 2009-08-25 20:17:52 UTC (rev 59)
+++ components/pc/trunk/pc/src/main/java/org/gatein/pc/state/producer/ProducerPortletInvoker.java 2009-08-25 20:21:36 UTC (rev 60)
@@ -121,6 +121,11 @@
public Portlet getPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
{
+ return _getPortlet(portletContext);
+ }
+
+ private <S extends Serializable> Portlet _getPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
+ {
if (portletContext == null)
{
throw new IllegalArgumentException("No null portlet id accepted");
@@ -134,9 +139,10 @@
{
if (portletContext instanceof StatefulPortletContext)
{
- StatefulPortletContext<PortletState> statefulPortletContext = (StatefulPortletContext)portletContext;
- PortletState state = statefulPortletContext.getState();
+ StatefulPortletContext<S> statefulPortletContext = (StatefulPortletContext)portletContext;
+ S state = statefulPortletContext.getState();
+ //
try
{
PortletState portletState = stateConverter.unmarshall(statefulPortletContext.getType(), state);
@@ -240,7 +246,15 @@
//
PortletStateType<?> stateType = instanceCtx.getStateType();
- boolean persistLocally = stateType == null || stateManagementPolicy.persistLocally();
+ boolean persistLocally;
+ if (stateType == null)
+ {
+ persistLocally = true;
+ }
+ else
+ {
+ persistLocally = stateManagementPolicy.persistLocally();
+ }
//
switch(access)
@@ -349,7 +363,7 @@
return response;
}
- public PortletContext createClone(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ public PortletContext createClone(PortletStateType stateType, PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
{
if (portletContext == null)
{
@@ -361,7 +375,15 @@
InternalContext context = getStateContext(portletContext);
//
- boolean persistLocally = !(portletContext instanceof StatefulPortletContext) || stateManagementPolicy.persistLocally();
+ boolean persistLocally;
+ if (stateType == null)
+ {
+ persistLocally = true;
+ }
+ else
+ {
+ persistLocally = stateManagementPolicy.persistLocally();
+ }
//
if (context.isStateful())
@@ -386,7 +408,6 @@
}
else
{
- PortletStateType<PortletContext> stateType = ((StatefulPortletContext)portletContext).getType();
return marshall(stateType, statefulContext.getPortletId(), statefulContext.getProperties());
}
}
@@ -401,7 +422,6 @@
}
else
{
- PortletStateType<PortletContext> stateType = ((StatefulPortletContext)portletContext).getType();
return marshall(stateType, portletId, newState);
}
}
Modified: components/pc/trunk/pc/src/test/java/org/gatein/pc/state/ConsumerStatefulPortletInvokerTestCase.java
===================================================================
--- components/pc/trunk/pc/src/test/java/org/gatein/pc/state/ConsumerStatefulPortletInvokerTestCase.java 2009-08-25 20:17:52 UTC (rev 59)
+++ components/pc/trunk/pc/src/test/java/org/gatein/pc/state/ConsumerStatefulPortletInvokerTestCase.java 2009-08-25 20:21:36 UTC (rev 60)
@@ -25,6 +25,7 @@
import org.gatein.pc.api.Portlet;
import org.gatein.pc.api.PortletContext;
import org.gatein.pc.api.PortletInvokerException;
+import org.gatein.pc.api.PortletStateType;
import org.gatein.pc.api.state.PropertyMap;
import org.gatein.pc.support.info.PortletInfoSupport;
import org.gatein.pc.support.PortletInvokerSupport;
@@ -161,7 +162,7 @@
protected PortletContext createLocalClone(PortletContext portletRef) throws Exception
{
stateManagementPolicy.setPersistLocally(true);
- PortletContext cloneRef = consumer.createClone(portletRef);
+ PortletContext cloneRef = consumer.createClone(null, portletRef);
stateManagementPolicy.setPersistLocally(persistLocally);
return cloneRef;
}
@@ -188,7 +189,7 @@
protected PortletContext createClone(PortletContext portletRef) throws PortletInvokerException
{
- return consumer.createClone(portletRef);
+ return consumer.createClone(persistLocally ? null : PortletStateType.OPAQUE, portletRef);
}
protected PortletContext setProperties(PortletContext portletRef, PropertyChange[] changes) throws PortletInvokerException
Modified: components/pc/trunk/pc/src/test/java/org/gatein/pc/state/ProducerStatefulPortletInvokerTestCase.java
===================================================================
--- components/pc/trunk/pc/src/test/java/org/gatein/pc/state/ProducerStatefulPortletInvokerTestCase.java 2009-08-25 20:17:52 UTC (rev 59)
+++ components/pc/trunk/pc/src/test/java/org/gatein/pc/state/ProducerStatefulPortletInvokerTestCase.java 2009-08-25 20:21:36 UTC (rev 60)
@@ -25,6 +25,7 @@
import org.gatein.pc.api.Portlet;
import org.gatein.pc.api.PortletContext;
import org.gatein.pc.api.PortletInvokerException;
+import org.gatein.pc.api.PortletStateType;
import org.gatein.pc.api.state.PropertyMap;
import org.gatein.pc.impl.state.StateManagementPolicyService;
import org.gatein.pc.impl.state.StateConverterV0;
@@ -126,7 +127,7 @@
protected PortletContext createLocalClone(PortletContext portletRef) throws Exception
{
stateManagementPolicy.setPersistLocally(true);
- PortletContext cloneContext = producer.createClone(portletRef);
+ PortletContext cloneContext = producer.createClone(null, portletRef);
stateManagementPolicy.setPersistLocally(persistLocally);
return cloneContext;
}
@@ -148,7 +149,7 @@
protected PortletContext createClone(PortletContext portletRef) throws PortletInvokerException
{
- return producer.createClone(portletRef);
+ return producer.createClone(persistLocally ? null : PortletStateType.OPAQUE, portletRef);
}
protected PortletContext setProperties(PortletContext portletRef, PropertyChange[] changes) throws PortletInvokerException
@@ -210,7 +211,12 @@
protected ActionInvocation createAction(PortletContext portletRef, AccessMode accessMode)
{
ActionContextImpl actionCtx = new ActionContextImpl();
- AbstractInstanceContext instanceCtx = new AbstractInstanceContext("blah", accessMode);
+ AbstractInstanceContext instanceCtx = new AbstractInstanceContext("blah", accessMode) {
+ @Override
+ public PortletStateType<?> getStateType() {
+ return persistLocally ? null : PortletStateType.OPAQUE;
+ }
+ };
//
ActionInvocation action = new ActionInvocation(actionCtx);
Modified: components/pc/trunk/pc/src/test/java/org/gatein/pc/support/PortletInvokerSupport.java
===================================================================
--- components/pc/trunk/pc/src/test/java/org/gatein/pc/support/PortletInvokerSupport.java 2009-08-25 20:17:52 UTC (rev 59)
+++ components/pc/trunk/pc/src/test/java/org/gatein/pc/support/PortletInvokerSupport.java 2009-08-25 20:21:36 UTC (rev 60)
@@ -28,6 +28,7 @@
import org.gatein.pc.api.PortletContext;
import org.gatein.pc.api.PortletInvokerException;
import org.gatein.pc.api.PortletInvoker;
+import org.gatein.pc.api.PortletStateType;
import org.gatein.pc.api.state.PropertyMap;
import org.gatein.pc.support.info.PortletInfoSupport;
import org.gatein.pc.api.invocation.PortletInvocation;
@@ -197,7 +198,7 @@
return props;
}
- public PortletContext createClone(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ public PortletContext createClone(PortletStateType stateType, PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
{
throw new UnsupportedOperationException();
}
15 years, 4 months
- 1
- 0
gatein SVN: r57 - components/mop/trunk.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-08-25 16:03:18 -0400 (Tue, 25 Aug 2009)
New Revision: 57
Modified:
components/mop/trunk/pom.xml
Log:
Reactor project doesn't need minor and bugfix versions. I won't be never released.
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2009-08-25 19:58:54 UTC (rev 56)
+++ components/mop/trunk/pom.xml 2009-08-25 20:03:18 UTC (rev 57)
@@ -33,7 +33,7 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop.main</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>MOP Main</name>
15 years, 4 months
- 1
- 0
gatein SVN: r56 - in components/pc/trunk: portal and 11 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-08-25 15:58:54 -0400 (Tue, 25 Aug 2009)
New Revision: 56
Added:
components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml
components/pc/trunk/portal/src/assemble/simple-portal-war-jboss51.xml
components/pc/trunk/portal/src/main/resources/jboss51/
components/pc/trunk/test/src/test/resources/jboss-5.1/
Removed:
components/pc/trunk/portal/src/assemble/simple-portal-jboss50.xml
components/pc/trunk/portal/src/assemble/simple-portal-war-jboss50.xml
components/pc/trunk/portal/src/main/resources/jboss50/
components/pc/trunk/test/src/test/resources/jboss-5.0/
Modified:
components/pc/trunk/pc/pom.xml
components/pc/trunk/portal/pom.xml
components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml
components/pc/trunk/test/pom.xml
components/pc/trunk/test/src/test/build.xml
components/pc/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/web.xml
components/pc/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/web.xml
components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml
components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml
components/pc/trunk/test/src/test/resources/test/servers.xml
Log:
Test on JBoss 4.2 and JBoss 5.1
Modified: components/pc/trunk/pc/pom.xml
===================================================================
--- components/pc/trunk/pc/pom.xml 2009-08-25 19:52:10 UTC (rev 55)
+++ components/pc/trunk/pc/pom.xml 2009-08-25 19:58:54 UTC (rev 56)
@@ -186,13 +186,11 @@
</execution>
</executions>
<configuration>
-
- <!--Uncomment if needed-->
- <!--<jpda>false</jpda>-->
- <!--<jpdaPort>9000</jpdaPort>-->
- <!--<jpdaSuspend>true</jpdaSuspend>-->
- <!--<failOnError>false</failOnError>-->
- <!--<assertions>true</assertions>-->
+ <jpda>false</jpda>
+ <jpdaPort>9000</jpdaPort>
+ <jpdaSuspend>true</jpdaSuspend>
+ <failOnError>false</failOnError>
+ <assertions>true</assertions>
<testsuites>
<testsuite>
<config>local-jboss-unit.xml</config>
Modified: components/pc/trunk/portal/pom.xml
===================================================================
--- components/pc/trunk/portal/pom.xml 2009-08-25 19:52:10 UTC (rev 55)
+++ components/pc/trunk/portal/pom.xml 2009-08-25 19:58:54 UTC (rev 56)
@@ -150,7 +150,7 @@
<descriptors>
<descriptor>src/assemble/simple-portal-jboss42.xml</descriptor>
<descriptor>src/assemble/simple-portal-tomcat60.xml</descriptor>
- <descriptor>src/assemble/simple-portal-jboss50.xml</descriptor>
+ <descriptor>src/assemble/simple-portal-jboss51.xml</descriptor>
</descriptors>
</configuration>
<executions>
Deleted: components/pc/trunk/portal/src/assemble/simple-portal-jboss50.xml
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-jboss50.xml 2009-08-25 19:52:10 UTC (rev 55)
+++ components/pc/trunk/portal/src/assemble/simple-portal-jboss50.xml 2009-08-25 19:58:54 UTC (rev 56)
@@ -1,89 +0,0 @@
-<!--
- ~ JBoss, a division of Red Hat
- ~ Copyright 2009, 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.
- -->
-
-<assembly>
- <id>jboss50</id>
- <formats>
- <format>dir</format>
- </formats>
- <baseDirectory>simple-portal</baseDirectory>
-
- <componentDescriptors>
- <componentDescriptor>src/assemble/simple-portal-war.xml</componentDescriptor>
- <componentDescriptor>src/assemble/simple-portal-war-jboss50.xml</componentDescriptor>
- </componentDescriptors>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
-
- <include>org.gatein.common:common-common</include>
- <include>org.gatein.wci:wci-wci</include>
- <include>org.gatein.pc:pc-pc</include>
- <include>org.gatein.pc:pc-api</include>
- <include>org.gatein.pc:pc-federation</include>
- <include>javax.ccpp:ccpp</include>
- <include>javax.portlet:portlet-api</include>
-
- <include>org.exoplatform.kernel:exo.kernel.container</include>
- <include>org.exoplatform.kernel:exo.kernel.commons</include>
- <!-- temporarly till we get rid of this dependency -->
- <include>org.exoplatform.portletcontainer:exo.pc.component.common</include>
- <include>picocontainer:picocontainer</include>
- <include>javax.xml.bind:jaxb-api</include>
- <include>org.jibx:jibx-run</include>
- <include>org.slf4j:slf4j-api</include>
- <include>org.slf4j:slf4j-jdk14</include>
- <include>javax.xml.stream:stax-api</include>
- <include>xpp3:xpp3</include>
- <include>commons-logging:commons-logging</include>
- <include>sun-jaxb:jaxb-api</include>
-
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory>
- <includes>
-
- <include>org.gatein.common:common-mc</include>
- <include>org.gatein.pc:pc-controller</include>
- <include>org.gatein.pc:pc-mc</include>
- <include>org.gatein.pc:pc-exo-integration</include>
- <include>org.gatein.pc:pc-samples</include>
- <include>org.jboss:jboss-common-core</include>
- <include>org.jboss:jboss-reflect</include>
- <include>org.jboss:jboss-mdr</include>
- <include>org.jboss:jbossxb</include>
-
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory></outputDirectory>
- <includes>
- <include></include>
- </includes>
- </dependencySet>
- </dependencySets>
-
-</assembly>
Copied: components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml (from rev 49, components/pc/trunk/portal/src/assemble/simple-portal-jboss50.xml)
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml (rev 0)
+++ components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml 2009-08-25 19:58:54 UTC (rev 56)
@@ -0,0 +1,89 @@
+<!--
+ ~ JBoss, a division of Red Hat
+ ~ Copyright 2009, 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.
+ -->
+
+<assembly>
+ <id>jboss50</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <baseDirectory>simple-portal</baseDirectory>
+
+ <componentDescriptors>
+ <componentDescriptor>src/assemble/simple-portal-war.xml</componentDescriptor>
+ <componentDescriptor>src/assemble/simple-portal-war-jboss51.xml</componentDescriptor>
+ </componentDescriptors>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+
+ <include>org.gatein.common:common-common</include>
+ <include>org.gatein.wci:wci-wci</include>
+ <include>org.gatein.pc:pc-pc</include>
+ <include>org.gatein.pc:pc-api</include>
+ <include>org.gatein.pc:pc-federation</include>
+ <include>javax.ccpp:ccpp</include>
+ <include>javax.portlet:portlet-api</include>
+
+ <include>org.exoplatform.kernel:exo.kernel.container</include>
+ <include>org.exoplatform.kernel:exo.kernel.commons</include>
+ <!-- temporarly till we get rid of this dependency -->
+ <include>org.exoplatform.portletcontainer:exo.pc.component.common</include>
+ <include>picocontainer:picocontainer</include>
+ <include>javax.xml.bind:jaxb-api</include>
+ <include>org.jibx:jibx-run</include>
+ <include>org.slf4j:slf4j-api</include>
+ <include>org.slf4j:slf4j-jdk14</include>
+ <include>javax.xml.stream:stax-api</include>
+ <include>xpp3:xpp3</include>
+ <include>commons-logging:commons-logging</include>
+ <include>sun-jaxb:jaxb-api</include>
+
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory>
+ <includes>
+
+ <include>org.gatein.common:common-mc</include>
+ <include>org.gatein.pc:pc-controller</include>
+ <include>org.gatein.pc:pc-mc</include>
+ <include>org.gatein.pc:pc-exo-integration</include>
+ <include>org.gatein.pc:pc-samples</include>
+ <include>org.jboss:jboss-common-core</include>
+ <include>org.jboss:jboss-reflect</include>
+ <include>org.jboss:jboss-mdr</include>
+ <include>org.jboss:jbossxb</include>
+
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include></include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
Deleted: components/pc/trunk/portal/src/assemble/simple-portal-war-jboss50.xml
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-war-jboss50.xml 2009-08-25 19:52:10 UTC (rev 55)
+++ components/pc/trunk/portal/src/assemble/simple-portal-war-jboss50.xml 2009-08-25 19:58:54 UTC (rev 56)
@@ -1,12 +0,0 @@
-<component>
-
- <fileSets>
-
- <fileSet>
- <directory>src/main/resources/jboss50</directory>
- <outputDirectory></outputDirectory>
- </fileSet>
-
- </fileSets>
-
-</component>
Copied: components/pc/trunk/portal/src/assemble/simple-portal-war-jboss51.xml (from rev 49, components/pc/trunk/portal/src/assemble/simple-portal-war-jboss50.xml)
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-war-jboss51.xml (rev 0)
+++ components/pc/trunk/portal/src/assemble/simple-portal-war-jboss51.xml 2009-08-25 19:58:54 UTC (rev 56)
@@ -0,0 +1,12 @@
+<component>
+
+ <fileSets>
+
+ <fileSet>
+ <directory>src/main/resources/jboss50</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+
+ </fileSets>
+
+</component>
Copied: components/pc/trunk/portal/src/main/resources/jboss51 (from rev 49, components/pc/trunk/portal/src/main/resources/jboss50)
Modified: components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml
===================================================================
--- components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2009-08-25 19:52:10 UTC (rev 55)
+++ components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2009-08-25 19:58:54 UTC (rev 56)
@@ -47,7 +47,7 @@
<url-pattern>*.jsp</url-pattern>
</filter-mapping>
<listener>
-<!-- <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class> -->
+<!-- <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class> -->
<listener-class>org.gatein.pc.portal.exo.kernel.KernelListener</listener-class>
</listener>
<servlet>
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2009-08-25 19:52:10 UTC (rev 55)
+++ components/pc/trunk/test/pom.xml 2009-08-25 19:58:54 UTC (rev 56)
@@ -197,6 +197,7 @@
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -211,11 +212,13 @@
</execution>
</executions>
<configuration>
- <!--<jpda>false</jpda>-->
- <!--<jpdaPort>9000</jpdaPort>-->
- <!--<jpdaSuspend>true</jpdaSuspend>-->
- <!--<failOnError>false</failOnError>-->
- <!--<assertions>true</assertions>-->
+ <!--
+ <jpda>true</jpda>
+ <jpdaPort>9000</jpdaPort>
+ <jpdaSuspend>true</jpdaSuspend>
+ <failOnError>false</failOnError>
+ <assertions>true</assertions>
+ -->
<testsuites>
<testsuite>
<config>test/local-jboss-unit.xml</config>
Modified: components/pc/trunk/test/src/test/build.xml
===================================================================
--- components/pc/trunk/test/src/test/build.xml 2009-08-25 19:52:10 UTC (rev 55)
+++ components/pc/trunk/test/src/test/build.xml 2009-08-25 19:58:54 UTC (rev 56)
@@ -76,7 +76,7 @@
</path>
<path id="portal-web-shared">
- <pathelement path="${dependency.portal-web-web.jar}"/>
+ <pathelement path="${dependency.gatein-wci-wci.jar}"/>
</path>
<path id="portal-portlet">
@@ -88,7 +88,7 @@
<path id="portal-portlet-shared">
<path location="${dependency.gatein-pc-pc.jar}"/>
<path location="${dependency.gatein-pc-api.jar}"/>
- <path location="${dependency.gatein-jsr168api.jar}"/>
+ <path location="${dependency.jsr168api.jar}"/>
</path>
<path id="exo">
@@ -130,7 +130,7 @@
<path location="${dependency.ccpp.jar}"/>
</path>
- <path id="jboss-5.0">
+ <path id="jboss-5.1">
<path refid="portal-common"/>
<path refid="portal-web"/>
<path refid="portal-portlet"/>
@@ -138,7 +138,7 @@
<path location="${dependency.jboss-common-core.jar}"/>
</path>
- <path id="jboss-5.0-shared">
+ <path id="jboss-5.1-shared">
<path refid="portal-common-shared"/>
<path refid="portal-web-shared"/>
<path refid="portal-portlet-shared"/>
@@ -208,46 +208,22 @@
<property environment="env"/>
<!--If properties are not in command line check if they are set in env-->
- <condition property="JBOSS_4_2_1_HOME" value="${env.JBOSS_4_2_1_HOME}">
+ <condition property="JBOSS_4_2_HOME" value="${env.JBOSS_4_2_HOME}">
<and>
- <isset property="env.JBOSS_4_2_1_HOME"/>
+ <isset property="env.JBOSS_4_2_HOME"/>
<not>
- <isset property="JBOSS_4_2_1_HOME"/>
+ <isset property="JBOSS_4_2_HOME"/>
</not>
</and>
</condition>
- <condition property="JBOSS_4_2_2_HOME" value="${env.JBOSS_4_2_2_HOME}">
+ <condition property="JBOSS_5_1_HOME" value="${env.JBOSS_5_1_HOME}">
<and>
- <isset property="env.JBOSS_4_2_2_HOME"/>
+ <isset property="env.JBOSS_5_1_HOME"/>
<not>
- <isset property="JBOSS_4_2_2_HOME"/>
+ <isset property="JBOSS_5_1_HOME"/>
</not>
</and>
</condition>
- <condition property="JBOSS_4_2_0_HOME" value="${env.JBOSS_4_2_0_HOME}">
- <and>
- <isset property="env.JBOSS_4_2_0_HOME"/>
- <not>
- <isset property="JBOSS_4_2_0_HOME"/>
- </not>
- </and>
- </condition>
- <condition property="JBOSS_4_2_3_HOME" value="${env.JBOSS_4_2_3_HOME}">
- <and>
- <isset property="env.JBOSS_4_2_3_HOME"/>
- <not>
- <isset property="JBOSS_4_2_3_HOME"/>
- </not>
- </and>
- </condition>
- <condition property="JBOSS_5_0_HOME" value="${env.JBOSS_5_0_HOME}">
- <and>
- <isset property="env.JBOSS_5_0_HOME"/>
- <not>
- <isset property="JBOSS_5_0_HOME"/>
- </not>
- </and>
- </condition>
<condition property="TOMCAT_6_0_HOME" value="${env.TOMCAT_6_0_HOME}">
<and>
<isset property="env.TOMCAT_6_0_HOME"/>
@@ -265,11 +241,8 @@
</and>
</condition>
- <echo message="JBOSS_4_2_0_HOME: ${JBOSS_4_2_0_HOME}"/>
- <echo message="JBOSS_4_2_1_HOME: ${JBOSS_4_2_1_HOME}"/>
- <echo message="JBOSS_4_2_2_HOME: ${JBOSS_4_2_2_HOME}"/>
- <echo message="JBOSS_4_2_3_HOME: ${JBOSS_4_2_3_HOME}"/>
- <echo message="JBOSS_5_0_HOME: ${JBOSS_5_0_HOME}"/>
+ <echo message="JBOSS_4_2_HOME: ${JBOSS_4_2_HOME}"/>
+ <echo message="JBOSS_5_1_HOME: ${JBOSS_5_1_HOME}"/>
<echo message="TOMCAT_6_0_HOME: ${TOMCAT_6_0_HOME}"/>
<echo message="JETTY_6_1_HOME: ${JETTY_6_1_HOME}"/>
</target>
@@ -299,33 +272,24 @@
</target>
<target name="__evaluate_properties.jboss">
- <fail message="Please set the environment variables JBOSS_4_2_0_HOME, JBOSS_4_2_1_HOME, JBOSS_4_2_2_HOME and JBOSS_4_2_3_HOME">
+ <fail message="Please set the environment variables JBOSS_4_2_HOME">
<condition>
<and>
<not>
- <isset property="JBOSS_4_2_0_HOME"/>
+ <isset property="JBOSS_4_2_HOME"/>
</not>
- <not>
- <isset property="JBOSS_4_2_1_HOME"/>
- </not>
- <not>
- <isset property="JBOSS_4_2_2_HOME"/>
- </not>
- <not>
- <isset property="JBOSS_4_2_3_HOME"/>
- </not>
</and>
</condition>
</fail>
- <!--<fail message="Please set the environment variable JBOSS_5_0_HOME">
+ <fail message="Please set the environment variable JBOSS_5_1_HOME">
<condition>
<and>
<not>
- <isset property="JBOSS_5_0_HOME"/>
+ <isset property="JBOSS_5_1_HOME"/>
</not>
</and>
</condition>
- </fail>-->
+ </fail>
</target>
<target name="__evaluate_properties.local">
@@ -540,18 +504,18 @@
<fileset dir="${test.temp.dir}/jboss-4.2/portlet-test-war"/>
</jar>
- <!-- JBoss 5.0 portlet-test.war -->
- <copy todir="${test.temp.dir}/jboss-5.0/portlet-test-war">
+ <!-- JBoss 5.1 portlet-test.war -->
+ <copy todir="${test.temp.dir}/jboss-5.1/portlet-test-war">
<fileset dir="${target}/test-classes/portlet-test-war"/>
- <fileset dir="${target}/test-classes/jboss-5.0/portlet-test-war"/>
+ <fileset dir="${target}/test-classes/jboss-5.1/portlet-test-war"/>
</copy>
- <copy todir="${test.temp.dir}/jboss-5.0/portlet-test-war/WEB-INF/lib" flatten="true">
+ <copy todir="${test.temp.dir}/jboss-5.1/portlet-test-war/WEB-INF/lib" flatten="true">
<fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/>
- <path refid="jboss-5.0"/>
+ <path refid="jboss-5.1"/>
</copy>
- <mkdir dir="${test.temp.lib}/jboss-5.0"/>
- <jar jarfile="${test.temp.lib}/jboss-5.0/portlet-test.war">
- <fileset dir="${test.temp.dir}/jboss-5.0/portlet-test-war">
+ <mkdir dir="${test.temp.lib}/jboss-5.1"/>
+ <jar jarfile="${test.temp.lib}/jboss-5.1/portlet-test.war">
+ <fileset dir="${test.temp.dir}/jboss-5.1/portlet-test-war">
<exclude name="**/jboss-kernel*.jar"/>
</fileset>
</jar>
@@ -644,7 +608,7 @@
</cargo>
</target>
- <target name="__tests.jboss-4.2.container-servlet" if="${test.jboss-4.2.home.variable-name}">
+ <target name="tests.jboss-4.2.container-servlet" if="${test.jboss-4.2.home.variable-name}">
<echo message="Starting JBoss 4.2 container-servlet tests with ${test.jboss-4.2.home}"/>
<antcall target="__cargo.jboss-4.2.start">
<param name="cargo.wait" value="false"/>
@@ -658,7 +622,7 @@
</antcall>
</target>
- <target name="__tests.jboss-4.2.generic" if="${test.jboss-4.2.home.variable-name}">
+ <target name="tests.jboss-4.2.generic" if="${test.jboss-4.2.home.variable-name}">
<echo message="Starting JBoss 4.2 generic tests with ${test.jboss-4.2.home}"/>
<antcall target="__cargo.jboss-4.2.start">
<param name="cargo.wait" value="false"/>
@@ -672,54 +636,17 @@
</antcall>
</target>
- <target name="__tests.jboss-4.2.0" if="JBOSS_4_2_0_HOME">
- <antcall target="__tests.jboss-4.2.container-servlet">
- <param name="test.id" value="JBoss-4_2_0-container-servlet"/>
- <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_0"/>
- <param name="test.jboss-4.2.home" value="${JBOSS_4_2_0_HOME}"/>
- <param name="test.jboss-4.2.home.variable-name" value="JBOSS_4_2_0_HOME"/>
- <param name="test.jboss-4.2.tempdir" value="${target}/cargo-tmp/4_2_0"/>
+ <target name="tests.jboss-4.2" if="JBOSS_4_2_HOME">
+ <antcall target="tests.jboss-4.2.container-servlet">
+ <param name="test.id" value="JBoss-4_2-container-servlet"/>
+ <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2"/>
+ <param name="test.jboss-4.2.home" value="${JBOSS_4_2_HOME}"/>
+ <param name="test.jboss-4.2.home.variable-name" value="JBOSS_4_2_HOME"/>
+ <param name="test.jboss-4.2.tempdir" value="${target}/cargo-tmp/4_2"/>
</antcall>
</target>
- <target name="__tests.jboss-4.2.1" if="JBOSS_4_2_1_HOME">
- <antcall target="__tests.jboss-4.2.container-servlet">
- <param name="test.id" value="JBoss-4_2_1-container-servlet"/>
- <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_1"/>
- <param name="test.jboss-4.2.home" value="${JBOSS_4_2_1_HOME}"/>
- <param name="test.jboss-4.2.home.variable-name" value="JBOSS_4_2_1_HOME"/>
- <param name="test.jboss-4.2.tempdir" value="${target}/cargo-tmp/4_2_1"/>
- </antcall>
- </target>
-
- <target name="__tests.jboss-4.2.2" if="JBOSS_4_2_2_HOME">
- <antcall target="__tests.jboss-4.2.container-servlet">
- <param name="test.id" value="JBoss-4_2_2-container-servlet"/>
- <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_2"/>
- <param name="test.jboss-4.2.home" value="${JBOSS_4_2_2_HOME}"/>
- <param name="test.jboss-4.2.home.variable-name" value="JBOSS_4_2_2_HOME"/>
- <param name="test.jboss-4.2.tempdir" value="${target}/cargo-tmp/4_2_2"/>
- </antcall>
- </target>
-
- <target name="__tests.jboss-4.2.3" if="JBOSS_4_2_3_HOME">
- <antcall target="__tests.jboss-4.2.container-servlet">
- <param name="test.id" value="JBoss-4_2_3-container-servlet"/>
- <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_3"/>
- <param name="test.jboss-4.2.home" value="${JBOSS_4_2_3_HOME}"/>
- <param name="test.jboss-4.2.home.variable-name" value="JBOSS_4_2_3_HOME"/>
- <param name="test.jboss-4.2.tempdir" value="${target}/cargo-tmp/4_2_3"/>
- </antcall>
- </target>
-
- <target name="tests.jboss-4.2">
- <antcall target="__tests.jboss-4.2.0"/>
- <antcall target="__tests.jboss-4.2.1"/>
- <antcall target="__tests.jboss-4.2.2"/>
- <antcall target="__tests.jboss-4.2.3"/>
- </target>
-
- <target name="__cargo.jboss-5.0.start" depends="__cargo.setup">
+ <target name="__cargo.jboss-5.1.start" depends="__cargo.setup">
<!-- The lib portal-test-lib.jar must be loaded at the shared level rather than in the war file
otherwise it is somehow inspected and produce a NoClassDefFoundError in the web service integration
layer on the class org/jboss/portal/test/framework/driver/remote/RemoteTestDriver for some unknown
@@ -727,12 +654,12 @@
org.jboss.ws.integration.jboss42.DeployerInterceptorJSE.isWebserviceDeployment(DeployerInterceptorJSE.java:84)
-->
- <property name="jboss-5.0-shared-property" refid="jboss-5.0-shared"/>
- <echo message="jboss-5.0-shared : ${jboss-5.0-shared-property}"/>
+ <property name="jboss-5.1-shared-property" refid="jboss-5.1-shared"/>
+ <echo message="jboss-5.1-shared : ${jboss-5.1-shared-property}"/>
<cargo
- containerId="jboss5x"
- home="${test.jboss-5.0.home}"
+ containerId="jboss51x"
+ home="${test.jboss-5.1.home}"
log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
output="${cargo.log.dir}/cargo.${test.id}.server.log"
action="start"
@@ -740,74 +667,74 @@
<!--<sysproperty key="java.io.tmpdir" value="${target}/cargo-tmp"/>-->
<sharedClasspath>
- <path refid="jboss-5.0-shared"/>
+ <path refid="jboss-5.1-shared"/>
<path refid="exo"/>
</sharedClasspath>
- <configuration home="${test.jboss-5.0.tempdir}">
+ <configuration home="${test.jboss-5.1.tempdir}">
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
<property name="cargo.rmi.port" value="1099"/>
<property name="cargo.jvmargs" value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"/>
- <deployable type="war" file="${test.temp.lib}/jboss-5.0/portlet-test.war"/>
+ <deployable type="war" file="${test.temp.lib}/jboss-5.1/portlet-test.war"/>
</configuration>
</cargo>
</target>
- <target name="__cargo.jboss-5.0.stop" depends="__cargo.setup">
+ <target name="__cargo.jboss-5.1.stop" depends="__cargo.setup">
<cargo
- containerId="jboss5x"
- home="${test.jboss-5.0.home}"
+ containerId="jboss51x"
+ home="${test.jboss-5.1.home}"
log="${cargo.log.dir}/cargo.${test.id}.startup.log"
action="stop">
<!--<sysproperty key="java.io.tmpdir" value="${target}/cargo-tmp"/>-->
- <configuration home="${test.jboss-5.0.tempdir}">
+ <configuration home="${test.jboss-5.1.tempdir}">
<property name="cargo.rmi.port" value="1099"/>
</configuration>
</cargo>
</target>
- <target name="tests.jboss-5.0.container-servlet" if="${test.jboss-5.0.home.variable-name}">
- <echo message="Starting JBoss 5.0 container-servlet tests with ${test.jboss-5.0.home}"/>
- <antcall target="__cargo.jboss-5.0.start">
+ <target name="tests.jboss-5.1.container-servlet" if="${test.jboss-5.1.home.variable-name}">
+ <echo message="Starting JBoss 5.1 container-servlet tests with ${test.jboss-5.1.home}"/>
+ <antcall target="__cargo.jboss-5.1.start">
<param name="cargo.wait" value="false"/>
<param name="test.spi.server.path" value="${test.archive.path}"/>
</antcall>
<antcall target="__tests.remote">
- <param name="test.server.name" value="${test.jboss-5.0.name}"/>
- <param name="test.deploy.name" value="jboss-5.0-container-servlet"/>
+ <param name="test.server.name" value="${test.jboss-5.1.name}"/>
+ <param name="test.deploy.name" value="jboss-5.1-container-servlet"/>
</antcall>
- <antcall target="__cargo.jboss-5.0.stop">
+ <antcall target="__cargo.jboss-5.1.stop">
</antcall>
</target>
- <target name="tests.jboss-5.0.generic" if="${test.jboss-5.0.home.variable-name}">
- <echo message="Starting JBoss 5.0 generic tests with ${test.jboss-5.0.home}"/>
- <antcall target="__cargo.jboss-5.0.start">
+ <target name="tests.jboss-5.1.generic" if="${test.jboss-5.1.home.variable-name}">
+ <echo message="Starting JBoss 5.1 generic tests with ${test.jboss-5.1.home}"/>
+ <antcall target="__cargo.jboss-5.1.start">
<param name="cargo.wait" value="false"/>
<param name="test.spi.server.path" value="${test.archive.path}"/>
</antcall>
<antcall target="__tests.remote">
- <param name="test.server.name" value="${test.jboss-5.0.name}"/>
- <param name="test.deploy.name" value="jboss-5.0-generic"/>
+ <param name="test.server.name" value="${test.jboss-5.1.name}"/>
+ <param name="test.deploy.name" value="jboss-5.1-generic"/>
</antcall>
- <antcall target="__cargo.jboss-5.0.stop">
+ <antcall target="__cargo.jboss-5.1.stop">
</antcall>
</target>
- <target name="tests.jboss-5.0" if="JBOSS_5_0_HOME">
- <antcall target="tests.jboss-5.0.container-servlet">
- <param name="test.id" value="JBoss-5_0-container-servlet"/>
- <param name="test.jboss-5.0.name" value="RemoteJBoss_5_0"/>
- <param name="test.jboss-5.0.home" value="${JBOSS_5_0_HOME}"/>
- <param name="test.jboss-5.0.home.variable-name" value="JBOSS_5_0_HOME"/>
- <param name="test.jboss-5.0.tempdir" value="${target}/cargo-tmp/5_0"/>
+ <target name="tests.jboss-5.1" if="JBOSS_5_1_HOME">
+ <antcall target="tests.jboss-5.1.container-servlet">
+ <param name="test.id" value="JBoss-5_1-container-servlet"/>
+ <param name="test.jboss-5.1.name" value="RemoteJBoss_5_1"/>
+ <param name="test.jboss-5.1.home" value="${JBOSS_5_1_HOME}"/>
+ <param name="test.jboss-5.1.home.variable-name" value="JBOSS_5_1_HOME"/>
+ <param name="test.jboss-5.1.tempdir" value="${target}/cargo-tmp/5_1"/>
</antcall>
</target>
<target name="tests.jboss">
<antcall target="tests.jboss-4.2"/>
- <!-- <antcall target="tests.jboss-5.0"/> -->
+ <antcall target="tests.jboss-5.1"/>
</target>
<target name="tests.local">
@@ -830,6 +757,7 @@
output="${cargo.log.dir}/cargo.${test.id}.server.log"
log="${cargo.log.dir}/cargo.${test.id}.start.log"
action="start"
+ timeout="180000"
wait="${cargo.wait}">
<sharedClasspath>
@@ -1020,12 +948,12 @@
<fileset dir="${target}/test-classes/portlet-tck-war"/>
</copy>
<copy todir="${tck-jboss5}/portlet-tck-war">
- <fileset dir="${target}/test-classes/jboss-5.0/portlet-tck-war"/>
+ <fileset dir="${target}/test-classes/jboss-5.1/portlet-tck-war"/>
</copy>
<copy todir="${tck-jboss5}/portlet-tck-war/WEB-INF/lib" flatten="true">
<fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/>
- <path refid="jboss-5.0"/>
+ <path refid="jboss-5.1"/>
</copy>
<mkdir dir="${tck-jboss5}/tck-portal"/>
@@ -1037,7 +965,7 @@
</jar>
<copy todir="${tck-jboss5}/tck-portal" flatten="true">
- <path refid="jboss-5.0-shared"/>
+ <path refid="jboss-5.1-shared"/>
</copy>
<!--TOMCAT-->
Copied: components/pc/trunk/test/src/test/resources/jboss-5.1 (from rev 49, components/pc/trunk/test/src/test/resources/jboss-5.0)
Modified: components/pc/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/web.xml
===================================================================
--- components/pc/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/web.xml 2009-08-25 19:52:10 UTC (rev 55)
+++ components/pc/trunk/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/web.xml 2009-08-25 19:58:54 UTC (rev 56)
@@ -31,7 +31,7 @@
<param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
- <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
+ <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
</listener>
<servlet>
<servlet-name>PortalServlet</servlet-name>
Modified: components/pc/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/web.xml
===================================================================
--- components/pc/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/web.xml 2009-08-25 19:52:10 UTC (rev 55)
+++ components/pc/trunk/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/web.xml 2009-08-25 19:58:54 UTC (rev 56)
@@ -31,7 +31,7 @@
<param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
- <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
+ <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
</listener>
<servlet>
<servlet-name>PortalServlet</servlet-name>
Modified: components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml
===================================================================
--- components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2009-08-25 19:52:10 UTC (rev 55)
+++ components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2009-08-25 19:58:54 UTC (rev 56)
@@ -31,7 +31,7 @@
<param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
- <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
+ <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
</listener>
<servlet>
<servlet-name>exoint</servlet-name>
Modified: components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml
===================================================================
--- components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml 2009-08-25 19:52:10 UTC (rev 55)
+++ components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml 2009-08-25 19:58:54 UTC (rev 56)
@@ -31,7 +31,7 @@
<param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
</context-param>
<listener>
- <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
+ <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
</listener>
<servlet>
<servlet-name>exoint</servlet-name>
Modified: components/pc/trunk/test/src/test/resources/test/servers.xml
===================================================================
--- components/pc/trunk/test/src/test/resources/test/servers.xml 2009-08-25 19:52:10 UTC (rev 55)
+++ components/pc/trunk/test/src/test/resources/test/servers.xml 2009-08-25 19:58:54 UTC (rev 56)
@@ -44,7 +44,7 @@
</node>
</server>
<server>
- <server-name>RemoteJBoss_4_2_0</server-name>
+ <server-name>RemoteJBoss_4_2</server-name>
<node>
<node-id>default</node-id>
<service>
@@ -62,7 +62,7 @@
</node>
</server>
<server>
- <server-name>RemoteJBoss_4_2_1</server-name>
+ <server-name>RemoteJBoss_5_1</server-name>
<node>
<node-id>default</node-id>
<service>
@@ -72,60 +72,6 @@
</service>
<deployer>
<remote>
- <name>jboss4x</name>
- <host>localhost</host>
- <port>8080</port>
- </remote>
- </deployer>
- </node>
- </server>
- <server>
- <server-name>RemoteJBoss_4_2_2</server-name>
- <node>
- <node-id>default</node-id>
- <service>
- <service-name>TestDriverServer</service-name>
- <interface>org.jboss.unit.remote.driver.RemoteTestDriver</interface>
- <uri>socket://localhost:5400</uri>
- </service>
- <deployer>
- <remote>
- <name>jboss4x</name>
- <host>localhost</host>
- <port>8080</port>
- </remote>
- </deployer>
- </node>
- </server>
- <server>
- <server-name>RemoteJBoss_4_2_3</server-name>
- <node>
- <node-id>default</node-id>
- <service>
- <service-name>TestDriverServer</service-name>
- <interface>org.jboss.unit.remote.driver.RemoteTestDriver</interface>
- <uri>socket://localhost:5400</uri>
- </service>
- <deployer>
- <remote>
- <name>jboss4x</name>
- <host>localhost</host>
- <port>8080</port>
- </remote>
- </deployer>
- </node>
- </server>
- <server>
- <server-name>RemoteJBoss_5_0</server-name>
- <node>
- <node-id>default</node-id>
- <service>
- <service-name>TestDriverServer</service-name>
- <interface>org.jboss.unit.remote.driver.RemoteTestDriver</interface>
- <uri>socket://localhost:5400</uri>
- </service>
- <deployer>
- <remote>
<name>jboss5x</name>
<host>localhost</host>
<port>8080</port>
15 years, 4 months
- 1
- 0
gatein SVN: r55 - components/mop/trunk.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-08-25 15:52:10 -0400 (Tue, 25 Aug 2009)
New Revision: 55
Modified:
components/mop/trunk/pom.xml
Log:
Master pom have to extend JBoss parent if we want to deploy all modules
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2009-08-25 19:51:12 UTC (rev 54)
+++ components/mop/trunk/pom.xml 2009-08-25 19:52:10 UTC (rev 55)
@@ -25,6 +25,12 @@
<!-- Project Definition -->
<!-- ****************** -->
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>5-beta-1</version>
+ </parent>
+
<groupId>org.gatein.mop</groupId>
<artifactId>mop.main</artifactId>
<version>1.0.0-SNAPSHOT</version>
15 years, 4 months
- 1
- 0
gatein SVN: r54 - components/mop/trunk/api.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-08-25 15:51:12 -0400 (Tue, 25 Aug 2009)
New Revision: 54
Modified:
components/mop/trunk/api/pom.xml
Log:
GTNMOP-3 : Change version from 1.0.0-SNAPSHOT to 1-SNAPSHOT
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2009-08-25 19:50:59 UTC (rev 53)
+++ components/mop/trunk/api/pom.xml 2009-08-25 19:51:12 UTC (rev 54)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop.parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
15 years, 4 months
- 1
- 0
gatein SVN: r53 - components/mop/trunk/core.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2009-08-25 15:50:59 -0400 (Tue, 25 Aug 2009)
New Revision: 53
Modified:
components/mop/trunk/core/pom.xml
Log:
GTNMOP-3 : Change version from 1.0.0-SNAPSHOT to 1-SNAPSHOT
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2009-08-25 19:50:41 UTC (rev 52)
+++ components/mop/trunk/core/pom.xml 2009-08-25 19:50:59 UTC (rev 53)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop.parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
15 years, 4 months
- 1
- 0