JBoss Portal SVN: r8417 - in modules/test/trunk/test: src/main and 4 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-21 11:53:21 -0400 (Fri, 21 Sep 2007)
New Revision: 8417
Added:
modules/test/trunk/test/src/main/java/
modules/test/trunk/test/src/main/java/org/
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/MonoValuedTestParameterValue.java
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/MultiValuedTestParameterValue.java
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/TestParameterValue.java
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/TestParametrization.java
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/driver/web/WebTestDriverHandler.java
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/embedded/
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/impl/
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/info/
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/junit/
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/mc/
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/runner/
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/server/
modules/test/trunk/test/src/main/java/org/jboss/test/
Removed:
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/MonoValuedTestParameterValue.java
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/MultiValuedTestParameterValue.java
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/TestParameterValue.java
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/TestParametrization.java
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/driver/web/WebTestDriverHandler.java
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/embedded/
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/impl/
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/info/
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/junit/
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/mc/
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/runner/
modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/server/
modules/test/trunk/test/src/main/java/org/jboss/test/
modules/test/trunk/test/src/main/org/
Modified:
modules/test/trunk/test/.classpath
Log:
Moving the classes at the correct place
Modified: modules/test/trunk/test/.classpath
===================================================================
--- modules/test/trunk/test/.classpath 2007-09-21 15:49:06 UTC (rev 8416)
+++ modules/test/trunk/test/.classpath 2007-09-21 15:53:21 UTC (rev 8417)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main"/>
+ <classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/thirdparty/apache-ant/lib/ant.jar"/>
<classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/>
Copied: modules/test/trunk/test/src/main/java/org (from rev 8414, modules/test/trunk/test/src/main/org)
Deleted: modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/MonoValuedTestParameterValue.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/MonoValuedTestParameterValue.java 2007-09-21 15:26:48 UTC (rev 8414)
+++ modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/MonoValuedTestParameterValue.java 2007-09-21 15:53:21 UTC (rev 8417)
@@ -1,46 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.test.framework;
-
-/**
- * A mono value.
- *
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 7228 $
- */
-public class MonoValuedTestParameterValue extends TestParameterValue
-{
-
- /** The value. */
- protected final Object value;
-
- public MonoValuedTestParameterValue(Object value)
- {
- this.value = value;
- }
-
- public Object get()
- {
- return value;
- }
-}
Copied: modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/MonoValuedTestParameterValue.java (from rev 8415, modules/test/trunk/test/src/main/org/jboss/portal/test/framework/MonoValuedTestParameterValue.java)
===================================================================
--- modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/MonoValuedTestParameterValue.java (rev 0)
+++ modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/MonoValuedTestParameterValue.java 2007-09-21 15:53:21 UTC (rev 8417)
@@ -0,0 +1,46 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.test.framework;
+
+/**
+ * A mono value.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 7228 $
+ */
+public class MonoValuedTestParameterValue extends TestParameterValue
+{
+
+ /** The value. */
+ protected final Object value;
+
+ public MonoValuedTestParameterValue(Object value)
+ {
+ this.value = value;
+ }
+
+ public Object get()
+ {
+ return value;
+ }
+}
Deleted: modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/MultiValuedTestParameterValue.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/MultiValuedTestParameterValue.java 2007-09-21 15:26:48 UTC (rev 8414)
+++ modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/MultiValuedTestParameterValue.java 2007-09-21 15:53:21 UTC (rev 8417)
@@ -1,91 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.test.framework;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-
-/**
- * A multi value.
- *
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 7228 $
- */
-public class MultiValuedTestParameterValue extends TestParameterValue
-{
-
- /** . */
- protected final Collection value;
-
- public MultiValuedTestParameterValue(Object[] value) throws IllegalArgumentException
- {
- if (value == null)
- {
- throw new IllegalArgumentException();
- }
-
- //
- this.value = Arrays.asList(value);
- }
-
- public MultiValuedTestParameterValue(Collection value) throws IllegalArgumentException
- {
- if (value == null)
- {
- throw new IllegalArgumentException();
- }
-
- //
- this.value = value;
- }
-
- public Object get()
- {
- return value;
- }
-
- /** Return an iterator over the values. */
- public Iterator iterator()
- {
- return new Iterator()
- {
- Iterator i = value.iterator();
-
- public boolean hasNext()
- {
- return i.hasNext();
- }
-
- public Object next()
- {
- return new MonoValuedTestParameterValue(i.next());
- }
-
- public void remove()
- {
- throw new UnsupportedOperationException();
- }
- };
- }
-}
Copied: modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/MultiValuedTestParameterValue.java (from rev 8415, modules/test/trunk/test/src/main/org/jboss/portal/test/framework/MultiValuedTestParameterValue.java)
===================================================================
--- modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/MultiValuedTestParameterValue.java (rev 0)
+++ modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/MultiValuedTestParameterValue.java 2007-09-21 15:53:21 UTC (rev 8417)
@@ -0,0 +1,91 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.test.framework;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+
+/**
+ * A multi value.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 7228 $
+ */
+public class MultiValuedTestParameterValue extends TestParameterValue
+{
+
+ /** . */
+ protected final Collection value;
+
+ public MultiValuedTestParameterValue(Object[] value) throws IllegalArgumentException
+ {
+ if (value == null)
+ {
+ throw new IllegalArgumentException();
+ }
+
+ //
+ this.value = Arrays.asList(value);
+ }
+
+ public MultiValuedTestParameterValue(Collection value) throws IllegalArgumentException
+ {
+ if (value == null)
+ {
+ throw new IllegalArgumentException();
+ }
+
+ //
+ this.value = value;
+ }
+
+ public Object get()
+ {
+ return value;
+ }
+
+ /** Return an iterator over the values. */
+ public Iterator iterator()
+ {
+ return new Iterator()
+ {
+ Iterator i = value.iterator();
+
+ public boolean hasNext()
+ {
+ return i.hasNext();
+ }
+
+ public Object next()
+ {
+ return new MonoValuedTestParameterValue(i.next());
+ }
+
+ public void remove()
+ {
+ throw new UnsupportedOperationException();
+ }
+ };
+ }
+}
Deleted: modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/TestParameterValue.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/TestParameterValue.java 2007-09-21 15:26:48 UTC (rev 8414)
+++ modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/TestParameterValue.java 2007-09-21 15:53:21 UTC (rev 8417)
@@ -1,63 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.test.framework;
-
-import java.io.Serializable;
-
-/**
- * The value of a test parameter.
- *
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 7228 $
- */
-public abstract class TestParameterValue implements Serializable
-{
- /**
- * Return the actual value.
- *
- * @return
- */
- public abstract Object get();
-
- public int hashCode()
- {
- Object o = get();
- return o == null ? 0 : o.hashCode();
- }
-
- public boolean equals(Object obj)
- {
- if (obj == this)
- {
- return true;
- }
- if (obj instanceof TestParameterValue)
- {
- TestParameterValue that = (TestParameterValue)obj;
- Object thisO = get();
- Object thatO = that.get();
- return thisO == null ? thatO == null : thisO.equals(thatO);
- }
- return false;
- }
-}
Copied: modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/TestParameterValue.java (from rev 8415, modules/test/trunk/test/src/main/org/jboss/portal/test/framework/TestParameterValue.java)
===================================================================
--- modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/TestParameterValue.java (rev 0)
+++ modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/TestParameterValue.java 2007-09-21 15:53:21 UTC (rev 8417)
@@ -0,0 +1,63 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.test.framework;
+
+import java.io.Serializable;
+
+/**
+ * The value of a test parameter.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 7228 $
+ */
+public abstract class TestParameterValue implements Serializable
+{
+ /**
+ * Return the actual value.
+ *
+ * @return
+ */
+ public abstract Object get();
+
+ public int hashCode()
+ {
+ Object o = get();
+ return o == null ? 0 : o.hashCode();
+ }
+
+ public boolean equals(Object obj)
+ {
+ if (obj == this)
+ {
+ return true;
+ }
+ if (obj instanceof TestParameterValue)
+ {
+ TestParameterValue that = (TestParameterValue)obj;
+ Object thisO = get();
+ Object thatO = that.get();
+ return thisO == null ? thatO == null : thisO.equals(thatO);
+ }
+ return false;
+ }
+}
Deleted: modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/TestParametrization.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/TestParametrization.java 2007-09-21 15:26:48 UTC (rev 8414)
+++ modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/TestParametrization.java 2007-09-21 15:53:21 UTC (rev 8417)
@@ -1,195 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.test.framework;
-
-import org.jboss.portal.test.framework.info.TestInfo;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * The parametrization of a test.
- *
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 7230 $
- */
-public class TestParametrization implements Serializable
-{
-
- /** . */
- private Map parameterValues;
-
- public TestParametrization()
- {
- parameterValues = new HashMap();
- }
-
- public TestParametrization(Map parameterValues) throws IllegalArgumentException
- {
- this();
-
- //
- if (parameterValues == null)
- {
- throw new IllegalArgumentException();
- }
-
- //
- for (Iterator i = parameterValues.entrySet().iterator(); i.hasNext();)
- {
- Map.Entry entry = (Map.Entry)i.next();
- String parameterName = (String)entry.getKey();
- TestParameterValue parameterValue = (TestParameterValue)entry.getValue();
- setParameterValue(parameterName, parameterValue);
- }
- }
-
- /**
- * Set a parameter value, using a null value will remove the parameter.
- *
- * @param parameterName the parameter name
- * @param parameterValue the parameter value
- * @throws IllegalArgumentException if the parameter name is null
- */
- public void setParameterValue(String parameterName, TestParameterValue parameterValue) throws IllegalArgumentException
- {
- if (parameterName == null)
- {
- throw new IllegalArgumentException();
- }
- if (parameterValue == null)
- {
- parameterValues.remove(parameterName);
- }
- else
- {
- parameterValues.put(parameterName, parameterValue);
- }
- }
-
- /**
- * Return a parameter value.
- *
- * @param parameterName the parameter name
- * @return the parameter value or null if it does not exist
- * @throws IllegalArgumentException if the parameter name is null
- */
- public TestParameterValue getParameterValue(String parameterName) throws IllegalArgumentException
- {
- if (parameterName == null)
- {
- throw new IllegalArgumentException();
- }
- return (TestParameterValue)parameterValues.get(parameterName);
- }
-
- public boolean isEmpty()
- {
- return parameterValues.isEmpty();
- }
-
- public String toString()
- {
- StringBuffer tmp = new StringBuffer();
- for (Iterator i = parameterValues.entrySet().iterator(); i.hasNext();)
- {
- Map.Entry entry = (Map.Entry)i.next();
- String parameterName = (String)entry.getKey();
- TestParameterValue value = (TestParameterValue)entry.getValue();
- tmp.append(parameterName).append('=').append(value.get()).append(i.hasNext() ? "," : "");
- }
- return tmp.toString();
- }
-
- /**
- * Build a collection of parametrization that satisfies the parameters exposed by the test meta information and the
- * parameter provided by the map.
- */
- public Collection create(TestInfo info)
- {
- ArrayList c = new ArrayList();
- c.add(new HashMap());
-
- Set expectedParameters = new HashSet(info.getParameterNames());
-
- //
- for (Iterator i = parameterValues.entrySet().iterator(); i.hasNext();)
- {
- Map.Entry entry = (Map.Entry)i.next();
- String parameterName = (String)entry.getKey();
- TestParameterValue value = (TestParameterValue)entry.getValue();
-
- //
- if (expectedParameters.contains(parameterName))
- {
- expectedParameters.remove(parameterName);
-
- //
- if (value instanceof MultiValuedTestParameterValue)
- {
- MultiValuedTestParameterValue multiValue = (MultiValuedTestParameterValue)value;
- ArrayList tmp = new ArrayList();
- for (Iterator j = multiValue.iterator(); j.hasNext();)
- {
- TestParameterValue o = (TestParameterValue)j.next();
- ArrayList copy = new ArrayList(c.size());
- for (Iterator k = c.iterator(); k.hasNext();)
- {
- Map parametrization = (Map)k.next();
- parametrization = new HashMap(parametrization);
- parametrization.put(parameterName, o);
- copy.add(parametrization);
- }
- tmp.addAll(copy);
- }
- c = tmp;
- }
- else
- {
- for (int j = 0; j < c.size(); j++)
- {
- Map parametrization = (Map)c.get(j);
- parametrization.put(parameterName, value);
- }
- }
- }
- }
-
- //
- for (int i = 0; i < c.size(); i++)
- {
- Map parametrization = (Map)c.get(i);
- TestParametrization ctx = new TestParametrization(parametrization);
- c.set(i, ctx);
- }
-
- //
- return c;
- }
-}
Copied: modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/TestParametrization.java (from rev 8415, modules/test/trunk/test/src/main/org/jboss/portal/test/framework/TestParametrization.java)
===================================================================
--- modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/TestParametrization.java (rev 0)
+++ modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/TestParametrization.java 2007-09-21 15:53:21 UTC (rev 8417)
@@ -0,0 +1,195 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.test.framework;
+
+import org.jboss.portal.test.framework.info.TestInfo;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * The parametrization of a test.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 7230 $
+ */
+public class TestParametrization implements Serializable
+{
+
+ /** . */
+ private Map parameterValues;
+
+ public TestParametrization()
+ {
+ parameterValues = new HashMap();
+ }
+
+ public TestParametrization(Map parameterValues) throws IllegalArgumentException
+ {
+ this();
+
+ //
+ if (parameterValues == null)
+ {
+ throw new IllegalArgumentException();
+ }
+
+ //
+ for (Iterator i = parameterValues.entrySet().iterator(); i.hasNext();)
+ {
+ Map.Entry entry = (Map.Entry)i.next();
+ String parameterName = (String)entry.getKey();
+ TestParameterValue parameterValue = (TestParameterValue)entry.getValue();
+ setParameterValue(parameterName, parameterValue);
+ }
+ }
+
+ /**
+ * Set a parameter value, using a null value will remove the parameter.
+ *
+ * @param parameterName the parameter name
+ * @param parameterValue the parameter value
+ * @throws IllegalArgumentException if the parameter name is null
+ */
+ public void setParameterValue(String parameterName, TestParameterValue parameterValue) throws IllegalArgumentException
+ {
+ if (parameterName == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ if (parameterValue == null)
+ {
+ parameterValues.remove(parameterName);
+ }
+ else
+ {
+ parameterValues.put(parameterName, parameterValue);
+ }
+ }
+
+ /**
+ * Return a parameter value.
+ *
+ * @param parameterName the parameter name
+ * @return the parameter value or null if it does not exist
+ * @throws IllegalArgumentException if the parameter name is null
+ */
+ public TestParameterValue getParameterValue(String parameterName) throws IllegalArgumentException
+ {
+ if (parameterName == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ return (TestParameterValue)parameterValues.get(parameterName);
+ }
+
+ public boolean isEmpty()
+ {
+ return parameterValues.isEmpty();
+ }
+
+ public String toString()
+ {
+ StringBuffer tmp = new StringBuffer();
+ for (Iterator i = parameterValues.entrySet().iterator(); i.hasNext();)
+ {
+ Map.Entry entry = (Map.Entry)i.next();
+ String parameterName = (String)entry.getKey();
+ TestParameterValue value = (TestParameterValue)entry.getValue();
+ tmp.append(parameterName).append('=').append(value.get()).append(i.hasNext() ? "," : "");
+ }
+ return tmp.toString();
+ }
+
+ /**
+ * Build a collection of parametrization that satisfies the parameters exposed by the test meta information and the
+ * parameter provided by the map.
+ */
+ public Collection create(TestInfo info)
+ {
+ ArrayList c = new ArrayList();
+ c.add(new HashMap());
+
+ Set expectedParameters = new HashSet(info.getParameterNames());
+
+ //
+ for (Iterator i = parameterValues.entrySet().iterator(); i.hasNext();)
+ {
+ Map.Entry entry = (Map.Entry)i.next();
+ String parameterName = (String)entry.getKey();
+ TestParameterValue value = (TestParameterValue)entry.getValue();
+
+ //
+ if (expectedParameters.contains(parameterName))
+ {
+ expectedParameters.remove(parameterName);
+
+ //
+ if (value instanceof MultiValuedTestParameterValue)
+ {
+ MultiValuedTestParameterValue multiValue = (MultiValuedTestParameterValue)value;
+ ArrayList tmp = new ArrayList();
+ for (Iterator j = multiValue.iterator(); j.hasNext();)
+ {
+ TestParameterValue o = (TestParameterValue)j.next();
+ ArrayList copy = new ArrayList(c.size());
+ for (Iterator k = c.iterator(); k.hasNext();)
+ {
+ Map parametrization = (Map)k.next();
+ parametrization = new HashMap(parametrization);
+ parametrization.put(parameterName, o);
+ copy.add(parametrization);
+ }
+ tmp.addAll(copy);
+ }
+ c = tmp;
+ }
+ else
+ {
+ for (int j = 0; j < c.size(); j++)
+ {
+ Map parametrization = (Map)c.get(j);
+ parametrization.put(parameterName, value);
+ }
+ }
+ }
+ }
+
+ //
+ for (int i = 0; i < c.size(); i++)
+ {
+ Map parametrization = (Map)c.get(i);
+ TestParametrization ctx = new TestParametrization(parametrization);
+ c.set(i, ctx);
+ }
+
+ //
+ return c;
+ }
+}
Deleted: modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/driver/web/WebTestDriverHandler.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/web/WebTestDriverHandler.java 2007-09-21 15:26:48 UTC (rev 8414)
+++ modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/driver/web/WebTestDriverHandler.java 2007-09-21 15:53:21 UTC (rev 8417)
@@ -1,89 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.test.framework.driver.web;
-
-import org.jboss.portal.test.framework.driver.remote.RemoteTestDriverProtocolHandler;
-import org.jboss.portal.test.framework.driver.remote.TestConversation;
-import org.jboss.portal.test.framework.driver.remote.RemoteDriverCommandContext;
-import org.jboss.portal.test.framework.driver.remote.RemoteDriverResponseContext;
-import org.jboss.portal.test.framework.driver.DriverCommand;
-import org.jboss.portal.test.framework.driver.DriverResponse;
-import org.jboss.portal.test.framework.driver.web.response.WebDriverResponse;
-import org.jboss.portal.test.framework.driver.web.response.PerformClickResponse;
-import org.jboss.portal.test.framework.driver.web.response.GetPageResponse;
-import org.jboss.portal.test.framework.driver.web.response.DnDResponse;
-import org.jboss.portal.test.framework.driver.web.command.PerformClickCommand;
-import org.jboss.portal.test.framework.driver.web.command.GetPageCommand;
-import org.jboss.portal.test.framework.driver.web.command.DnDCommand;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public class WebTestDriverHandler implements RemoteTestDriverProtocolHandler
-{
-
- public DriverCommand createCommand(RemoteDriverResponseContext responseContext)
- {
- if (responseContext.getResponse() instanceof WebDriverResponse)
- {
- DriverResponse resp = responseContext.getResponse();
-
- //
- if (resp instanceof PerformClickResponse)
- {
- PerformClickResponse performClick = (PerformClickResponse)resp;
- return new PerformClickCommand(performClick.getId());
- }
- else if (resp instanceof GetPageResponse)
- {
- GetPageResponse getPage = (GetPageResponse)resp;
- return new GetPageCommand(getPage.getURI());
- }
- else if (resp instanceof DnDResponse)
- {
- DnDResponse dnd = (DnDResponse)resp;
- return new DnDCommand(dnd.getFromId(), dnd.getDeltaX(), dnd.getDeltaY());
- }
- }
-
- //
- return null;
- }
-
-
- public RemoteDriverResponseContext invoke(TestConversation conversation, RemoteDriverCommandContext commandContext) throws Exception
- {
- WebTestConversation webConversation = (WebTestConversation)conversation.getAttribute("web.conversation");
-
- //
- if (webConversation == null)
- {
- webConversation = new WebTestConversation(conversation);
- conversation.setAttribute("web.conversation", webConversation);
- }
-
- //
- return webConversation.invoke(commandContext);
- }
-}
Copied: modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/driver/web/WebTestDriverHandler.java (from rev 8415, modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/web/WebTestDriverHandler.java)
===================================================================
--- modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/driver/web/WebTestDriverHandler.java (rev 0)
+++ modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/driver/web/WebTestDriverHandler.java 2007-09-21 15:53:21 UTC (rev 8417)
@@ -0,0 +1,89 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.test.framework.driver.web;
+
+import org.jboss.portal.test.framework.driver.remote.RemoteTestDriverProtocolHandler;
+import org.jboss.portal.test.framework.driver.remote.TestConversation;
+import org.jboss.portal.test.framework.driver.remote.RemoteDriverCommandContext;
+import org.jboss.portal.test.framework.driver.remote.RemoteDriverResponseContext;
+import org.jboss.portal.test.framework.driver.DriverCommand;
+import org.jboss.portal.test.framework.driver.DriverResponse;
+import org.jboss.portal.test.framework.driver.web.response.WebDriverResponse;
+import org.jboss.portal.test.framework.driver.web.response.PerformClickResponse;
+import org.jboss.portal.test.framework.driver.web.response.GetPageResponse;
+import org.jboss.portal.test.framework.driver.web.response.DnDResponse;
+import org.jboss.portal.test.framework.driver.web.command.PerformClickCommand;
+import org.jboss.portal.test.framework.driver.web.command.GetPageCommand;
+import org.jboss.portal.test.framework.driver.web.command.DnDCommand;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class WebTestDriverHandler implements RemoteTestDriverProtocolHandler
+{
+
+ public DriverCommand createCommand(RemoteDriverResponseContext responseContext)
+ {
+ if (responseContext.getResponse() instanceof WebDriverResponse)
+ {
+ DriverResponse resp = responseContext.getResponse();
+
+ //
+ if (resp instanceof PerformClickResponse)
+ {
+ PerformClickResponse performClick = (PerformClickResponse)resp;
+ return new PerformClickCommand(performClick.getId());
+ }
+ else if (resp instanceof GetPageResponse)
+ {
+ GetPageResponse getPage = (GetPageResponse)resp;
+ return new GetPageCommand(getPage.getURI());
+ }
+ else if (resp instanceof DnDResponse)
+ {
+ DnDResponse dnd = (DnDResponse)resp;
+ return new DnDCommand(dnd.getFromId(), dnd.getDeltaX(), dnd.getDeltaY());
+ }
+ }
+
+ //
+ return null;
+ }
+
+
+ public RemoteDriverResponseContext invoke(TestConversation conversation, RemoteDriverCommandContext commandContext) throws Exception
+ {
+ WebTestConversation webConversation = (WebTestConversation)conversation.getAttribute("web.conversation");
+
+ //
+ if (webConversation == null)
+ {
+ webConversation = new WebTestConversation(conversation);
+ conversation.setAttribute("web.conversation", webConversation);
+ }
+
+ //
+ return webConversation.invoke(commandContext);
+ }
+}
Copied: modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/embedded (from rev 8415, modules/test/trunk/test/src/main/org/jboss/portal/test/framework/embedded)
Copied: modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/impl (from rev 8415, modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl)
Copied: modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/info (from rev 8415, modules/test/trunk/test/src/main/org/jboss/portal/test/framework/info)
Copied: modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/junit (from rev 8415, modules/test/trunk/test/src/main/org/jboss/portal/test/framework/junit)
Copied: modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/mc (from rev 8415, modules/test/trunk/test/src/main/org/jboss/portal/test/framework/mc)
Copied: modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/runner (from rev 8415, modules/test/trunk/test/src/main/org/jboss/portal/test/framework/runner)
Copied: modules/test/trunk/test/src/main/java/org/jboss/portal/test/framework/server (from rev 8415, modules/test/trunk/test/src/main/org/jboss/portal/test/framework/server)
Copied: modules/test/trunk/test/src/main/java/org/jboss/test (from rev 8415, modules/test/trunk/test/src/main/org/jboss/test)
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8416 - in modules/test/tags/1_0_0/test/src/main/java: org and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-21 11:49:06 -0400 (Fri, 21 Sep 2007)
New Revision: 8416
Added:
modules/test/tags/1_0_0/test/src/main/java/org/
modules/test/tags/1_0_0/test/src/main/java/org/jboss/
Removed:
modules/test/tags/1_0_0/test/src/main/java/jboss/
Log:
oups
Copied: modules/test/tags/1_0_0/test/src/main/java/org/jboss (from rev 8415, modules/test/tags/1_0_0/test/src/main/java/jboss)
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8415 - in modules/test/tags/1_0_0: test/src/main and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-21 11:43:39 -0400 (Fri, 21 Sep 2007)
New Revision: 8415
Added:
modules/test/tags/1_0_0/test/src/main/java/
Removed:
modules/test/tags/1_0_0/test/src/main/org/
Modified:
modules/test/tags/1_0_0/.classpath
Log:
Classes weren't at the correct place
Modified: modules/test/tags/1_0_0/.classpath
===================================================================
--- modules/test/tags/1_0_0/.classpath 2007-09-21 15:26:48 UTC (rev 8414)
+++ modules/test/tags/1_0_0/.classpath 2007-09-21 15:43:39 UTC (rev 8415)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="test/src/main"/>
+ <classpathentry kind="src" path="test/src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="lib" path="thirdparty/junit/lib/junit.jar"/>
<classpathentry kind="lib" path="thirdparty/apache-log4j/lib/log4j.jar"/>
Copied: modules/test/tags/1_0_0/test/src/main/java (from rev 8414, modules/test/tags/1_0_0/test/src/main/org)
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8414 - modules/test/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-21 11:26:48 -0400 (Fri, 21 Sep 2007)
New Revision: 8414
Added:
modules/test/tags/1_0_0/
Log:
Tag test module
Copied: modules/test/tags/1_0_0 (from rev 8413, modules/test/trunk)
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8413 - modules/test/trunk/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-21 11:21:26 -0400 (Fri, 21 Sep 2007)
New Revision: 8413
Modified:
modules/test/trunk/build/build-thirdparty.xml
modules/test/trunk/build/build.xml
Log:
Use common 1.0.0
Modified: modules/test/trunk/build/build-thirdparty.xml
===================================================================
--- modules/test/trunk/build/build-thirdparty.xml 2007-09-21 14:33:07 UTC (rev 8412)
+++ modules/test/trunk/build/build-thirdparty.xml 2007-09-21 15:21:26 UTC (rev 8413)
@@ -33,7 +33,7 @@
<!-- Main Definition of dependencies -->
<build id="jbossportal-thirdparty"
impltitle="JBossPortal"
- implversion="jboss-portal-2.6.1.CR1"
+ implversion="1.0.0"
implvendor="JBoss, a division of Red Hat Inc."
implurl="http://www.jboss.org"
description="JBoss Portal"
@@ -47,7 +47,7 @@
are pushed to the http://repository.jboss.com site.
-->
- <componentref name="jboss-portal/modules/common" version="1.0.0-SNAPSHOT"/>
+ <componentref name="jboss-portal/modules/common" version="1.0.0"/>
<componentref name="codehaus/cargo" version="0.9"/>
Modified: modules/test/trunk/build/build.xml
===================================================================
--- modules/test/trunk/build/build.xml 2007-09-21 14:33:07 UTC (rev 8412)
+++ modules/test/trunk/build/build.xml 2007-09-21 15:21:26 UTC (rev 8413)
@@ -59,11 +59,11 @@
<!--| Project version information. |-->
<!--+==============================+-->
- <property name="version.major" value="2"/>
- <property name="version.minor" value="6"/>
+ <property name="version.major" value="1"/>
+ <property name="version.minor" value="0"/>
<property name="version.revision" value="0"/>
- <property name="version.tag" value="A"/>
- <property name="version.name" value="Ninja"/>
+ <property name="version.tag" value="GA"/>
+ <property name="version.name" value=""/>
<!-- This must be set to the CVS tag for any release -->
<property name="version.cvstag" value="HEAD"/>
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8412 - in modules/common/tags/1_0_0: build and 7 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-21 10:33:07 -0400 (Fri, 21 Sep 2007)
New Revision: 8412
Added:
modules/common/tags/1_0_0/mc/src/etc/
modules/common/tags/1_0_0/mc/src/etc/portal-common-mc-lib-jar.mf
modules/common/tags/1_0_0/portal/src/etc/
modules/common/tags/1_0_0/portal/src/etc/portal-common-portal-lib-jar.mf
Removed:
modules/common/tags/1_0_0/mc/src/etc/portal-common-mc-lib-jar.mf
modules/common/tags/1_0_0/portal/src/etc/portal-common-portal-lib-jar.mf
Modified:
modules/common/tags/1_0_0/.classpath
modules/common/tags/1_0_0/build/build.xml
modules/common/tags/1_0_0/mc/build.xml
modules/common/tags/1_0_0/portal/build.xml
modules/common/tags/1_0_0/tools/etc/buildfragments/defaults.ent
Log:
Merge on the tag
Modified: modules/common/tags/1_0_0/.classpath
===================================================================
--- modules/common/tags/1_0_0/.classpath 2007-09-21 14:31:04 UTC (rev 8411)
+++ modules/common/tags/1_0_0/.classpath 2007-09-21 14:33:07 UTC (rev 8412)
@@ -2,9 +2,18 @@
<classpath>
<classpathentry kind="src" path="mc/src/main/java"/>
<classpathentry kind="src" path="portal/src/main/java"/>
+ <classpathentry kind="src" path="common/src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/>
<classpathentry kind="lib" path="thirdparty/sun-servlet/lib/servlet-api.jar"/>
<classpathentry kind="lib" path="thirdparty/apache-log4j/lib/log4j.jar"/>
+ <classpathentry kind="lib" path="thirdparty/apache-ant/lib/ant.jar"/>
+ <classpathentry kind="lib" path="tools/lib/cargo-core-uberjar-0.8.jar"/>
+ <classpathentry kind="lib" path="thirdparty/oswego-concurrent/lib/concurrent.jar"/>
+ <classpathentry kind="lib" path="thirdparty/junit/lib/junit.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/>
+ <classpathentry kind="lib" path="tools/lib/ant-junit.jar"/>
+ <classpathentry kind="lib" path="thirdparty/apache-httpclient/lib/commons-httpclient.jar"/>
+ <classpathentry kind="lib" path="thirdparty/sun-jaf/lib/activation.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: modules/common/tags/1_0_0/build/build.xml
===================================================================
--- modules/common/tags/1_0_0/build/build.xml 2007-09-21 14:31:04 UTC (rev 8411)
+++ modules/common/tags/1_0_0/build/build.xml 2007-09-21 14:33:07 UTC (rev 8412)
@@ -66,7 +66,7 @@
<property name="version.name" value=""/>
<!-- This must be set to the CVS tag for any release -->
- <property name="version.cvstag" value="HEAD"/>
+ <property name="version.cvstag" value=""/>
<!-- Module name(s) & version -->
<property name="module.version"
Modified: modules/common/tags/1_0_0/mc/build.xml
===================================================================
--- modules/common/tags/1_0_0/mc/build.xml 2007-09-21 14:31:04 UTC (rev 8411)
+++ modules/common/tags/1_0_0/mc/build.xml 2007-09-21 14:33:07 UTC (rev 8412)
@@ -146,7 +146,7 @@
<mkdir dir="${build.lib}"/>
- <jar jarfile="${build.lib}/portal-common-mc-lib.jar">
+ <jar jarfile="${build.lib}/portal-common-mc-lib.jar" manifest="${build.etc}/portal-common-mc-lib-jar.mf">
<fileset dir="${build.classes}"/>
</jar>
Copied: modules/common/tags/1_0_0/mc/src/etc (from rev 8410, modules/common/trunk/mc/src/etc)
Deleted: modules/common/tags/1_0_0/mc/src/etc/portal-common-mc-lib-jar.mf
===================================================================
--- modules/common/trunk/mc/src/etc/portal-common-mc-lib-jar.mf 2007-09-21 14:26:14 UTC (rev 8410)
+++ modules/common/tags/1_0_0/mc/src/etc/portal-common-mc-lib-jar.mf 2007-09-21 14:33:07 UTC (rev 8412)
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Created-By: @java.vm.version@ (@java.vm.vendor@)
-Specification-Title: @specification.title@
-Specification-Version: @specification.version@
-Specification-Vendor: @specification.vendor@
-Implementation-Title: @implementation.title@
-Implementation-URL: @implementation.url@
-Implementation-Version: @implementation.version@
-Implementation-Vendor: @implementation.vendor@
-Implementation-Vendor-Id: @implementation.vendor.id@
Copied: modules/common/tags/1_0_0/mc/src/etc/portal-common-mc-lib-jar.mf (from rev 8410, modules/common/trunk/mc/src/etc/portal-common-mc-lib-jar.mf)
===================================================================
--- modules/common/tags/1_0_0/mc/src/etc/portal-common-mc-lib-jar.mf (rev 0)
+++ modules/common/tags/1_0_0/mc/src/etc/portal-common-mc-lib-jar.mf 2007-09-21 14:33:07 UTC (rev 8412)
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Created-By: @java.vm.version@ (@java.vm.vendor@)
+Specification-Title: @specification.title@
+Specification-Version: @specification.version@
+Specification-Vendor: @specification.vendor@
+Implementation-Title: @implementation.title@
+Implementation-URL: @implementation.url@
+Implementation-Version: @implementation.version@
+Implementation-Vendor: @implementation.vendor@
+Implementation-Vendor-Id: @implementation.vendor.id@
Modified: modules/common/tags/1_0_0/portal/build.xml
===================================================================
--- modules/common/tags/1_0_0/portal/build.xml 2007-09-21 14:31:04 UTC (rev 8411)
+++ modules/common/tags/1_0_0/portal/build.xml 2007-09-21 14:33:07 UTC (rev 8412)
@@ -142,7 +142,7 @@
<mkdir dir="${build.lib}"/>
- <jar jarfile="${build.lib}/portal-common-portal-lib.jar">
+ <jar jarfile="${build.lib}/portal-common-portal-lib.jar" manifest="${build.etc}/portal-common-portal-lib-jar.mf">
<fileset dir="${build.classes}"/>
</jar>
Copied: modules/common/tags/1_0_0/portal/src/etc (from rev 8410, modules/common/trunk/portal/src/etc)
Deleted: modules/common/tags/1_0_0/portal/src/etc/portal-common-portal-lib-jar.mf
===================================================================
--- modules/common/trunk/portal/src/etc/portal-common-portal-lib-jar.mf 2007-09-21 14:26:14 UTC (rev 8410)
+++ modules/common/tags/1_0_0/portal/src/etc/portal-common-portal-lib-jar.mf 2007-09-21 14:33:07 UTC (rev 8412)
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Created-By: @java.vm.version@ (@java.vm.vendor@)
-Specification-Title: @specification.title@
-Specification-Version: @specification.version@
-Specification-Vendor: @specification.vendor@
-Implementation-Title: @implementation.title@
-Implementation-URL: @implementation.url@
-Implementation-Version: @implementation.version@
-Implementation-Vendor: @implementation.vendor@
-Implementation-Vendor-Id: @implementation.vendor.id@
Copied: modules/common/tags/1_0_0/portal/src/etc/portal-common-portal-lib-jar.mf (from rev 8410, modules/common/trunk/portal/src/etc/portal-common-portal-lib-jar.mf)
===================================================================
--- modules/common/tags/1_0_0/portal/src/etc/portal-common-portal-lib-jar.mf (rev 0)
+++ modules/common/tags/1_0_0/portal/src/etc/portal-common-portal-lib-jar.mf 2007-09-21 14:33:07 UTC (rev 8412)
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Created-By: @java.vm.version@ (@java.vm.vendor@)
+Specification-Title: @specification.title@
+Specification-Version: @specification.version@
+Specification-Vendor: @specification.vendor@
+Implementation-Title: @implementation.title@
+Implementation-URL: @implementation.url@
+Implementation-Version: @implementation.version@
+Implementation-Vendor: @implementation.vendor@
+Implementation-Vendor-Id: @implementation.vendor.id@
Modified: modules/common/tags/1_0_0/tools/etc/buildfragments/defaults.ent
===================================================================
--- modules/common/tags/1_0_0/tools/etc/buildfragments/defaults.ent 2007-09-21 14:31:04 UTC (rev 8411)
+++ modules/common/tags/1_0_0/tools/etc/buildfragments/defaults.ent 2007-09-21 14:33:07 UTC (rev 8412)
@@ -20,15 +20,15 @@
<property name="version.cvstag" value="JBoss_4_0_0_DR3"/>
<!-- Manifest version info -->
- <property name="specification.title" value="JBoss"/>
- <property name="specification.version" value="${version.major}.${version.minor}"/>
- <property name="specification.vendor" value="JBoss Group, LLC (http://jboss.org)"/>
+ <property name="specification.title" value="JBoss Portal"/>
+ <property name="specification.version" value="${version.major}.${version.minor}.${version.revision}"/>
+ <property name="specification.vendor" value="Red Hat, Inc. (http://www.redhat.com)"/>
- <property name="implementation.title" value="JBoss [${version.name}]"/>
- <property name="implementation.url" value="http://jboss.org"/>
+ <property name="implementation.title" value="JBoss Portal ${version.name}"/>
+ <property name="implementation.url" value="http://labs.jboss.com/portal/jbossportal"/>
<property name="implementation.version"
- value="${version.major}.${version.minor}.${version.revision}${version.tag} (build: CVSTag=${version.cvstag} date=${build.id})"/>
- <property name="implementation.vendor" value="JBoss Group, LLC"/>
+ value="${version.major}.${version.minor}.${version.revision}.${version.tag} (date=${build.id})"/>
+ <property name="implementation.vendor" value="Red Hat, Inc."/>
<property name="implementation.vendor.id" value="${implementation.url}"/>
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8411 - in modules: portlet/trunk/tools/etc/buildfragments and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-21 10:31:04 -0400 (Fri, 21 Sep 2007)
New Revision: 8411
Modified:
modules/identity/trunk/tools/etc/buildfragments/defaults.ent
modules/portlet/trunk/tools/etc/buildfragments/defaults.ent
modules/test/trunk/tools/etc/buildfragments/defaults.ent
modules/web/trunk/tools/etc/buildfragments/defaults.ent
Log:
Adding manifests to the jars
Modified: modules/identity/trunk/tools/etc/buildfragments/defaults.ent
===================================================================
--- modules/identity/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 14:26:14 UTC (rev 8410)
+++ modules/identity/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 14:31:04 UTC (rev 8411)
@@ -20,15 +20,15 @@
<property name="version.cvstag" value="JBoss_4_0_0_DR3"/>
<!-- Manifest version info -->
- <property name="specification.title" value="JBoss"/>
- <property name="specification.version" value="${version.major}.${version.minor}"/>
- <property name="specification.vendor" value="JBoss Group, LLC (http://jboss.org)"/>
+ <property name="specification.title" value="JBoss Portal"/>
+ <property name="specification.version" value="${version.major}.${version.minor}.${version.revision}"/>
+ <property name="specification.vendor" value="Red Hat, Inc. (http://www.redhat.com)"/>
- <property name="implementation.title" value="JBoss [${version.name}]"/>
- <property name="implementation.url" value="http://jboss.org"/>
+ <property name="implementation.title" value="JBoss Portal ${version.name}"/>
+ <property name="implementation.url" value="http://labs.jboss.com/portal/jbossportal"/>
<property name="implementation.version"
- value="${version.major}.${version.minor}.${version.revision}${version.tag} (build: CVSTag=${version.cvstag} date=${build.id})"/>
- <property name="implementation.vendor" value="JBoss Group, LLC"/>
+ value="${version.major}.${version.minor}.${version.revision}.${version.tag} (date=${build.id})"/>
+ <property name="implementation.vendor" value="Red Hat, Inc."/>
<property name="implementation.vendor.id" value="${implementation.url}"/>
@@ -37,15 +37,17 @@
<!-- ========= -->
<!-- Where source files live -->
- <property name="source.classes" value="${module.source}/main"/>
+ <property name="source.classes" value="${module.source}/main/java"/>
<property name="source.docs" value="${module.source}/docs"/>
<property name="source.etc" value="${module.source}/etc"/>
<property name="source.examples" value="${module.source}/examples"/>
<property name="source.bin" value="${module.source}/bin"/>
- <property name="source.resources" value="${module.source}/resources"/>
+ <property name="source.resources" value="${module.source}/main/resources"/>
<property name="source.stylesheets" value="${module.source}/stylesheets"/>
<property name="source.web" value="${module.source}/web"/>
<property name="source.test" value="${module.source}/test"/>
+ <property name="source.test.classes" value="${module.source}/test/java"/>
+ <property name="source.test.resources" value="${module.source}/test/resources"/>
<!-- Where build generated files will go -->
<property name="build.api" value="${module.output}/api"/>
@@ -68,7 +70,9 @@
<property name="build.log" value="${module.output}/log"/>
<property name="build.cache" value="${module.output}/cache"/>
<property name="build.test" value="${module.output}/test"/>
- <property name="build.gen.test" value="${build.gen}/test"/>
+ <property name="build.test.classes" value="${module.output}/test/classes"/>
+ <property name="build.test.resources" value="${module.output}/test/resources"/>
+ <property name="build.test.gen" value="${build.gen}/test/gen"/>
<!-- Legacy -->
<property name="build.metadata" value="${module.output}/metadata"/>
Modified: modules/portlet/trunk/tools/etc/buildfragments/defaults.ent
===================================================================
--- modules/portlet/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 14:26:14 UTC (rev 8410)
+++ modules/portlet/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 14:31:04 UTC (rev 8411)
@@ -20,15 +20,15 @@
<property name="version.cvstag" value="JBoss_4_0_0_DR3"/>
<!-- Manifest version info -->
- <property name="specification.title" value="JBoss"/>
- <property name="specification.version" value="${version.major}.${version.minor}"/>
- <property name="specification.vendor" value="JBoss Group, LLC (http://jboss.org)"/>
+ <property name="specification.title" value="JBoss Portal"/>
+ <property name="specification.version" value="${version.major}.${version.minor}.${version.revision}"/>
+ <property name="specification.vendor" value="Red Hat, Inc. (http://www.redhat.com)"/>
- <property name="implementation.title" value="JBoss [${version.name}]"/>
- <property name="implementation.url" value="http://jboss.org"/>
+ <property name="implementation.title" value="JBoss Portal ${version.name}"/>
+ <property name="implementation.url" value="http://labs.jboss.com/portal/jbossportal"/>
<property name="implementation.version"
- value="${version.major}.${version.minor}.${version.revision}${version.tag} (build: CVSTag=${version.cvstag} date=${build.id})"/>
- <property name="implementation.vendor" value="JBoss Group, LLC"/>
+ value="${version.major}.${version.minor}.${version.revision}.${version.tag} (date=${build.id})"/>
+ <property name="implementation.vendor" value="Red Hat, Inc."/>
<property name="implementation.vendor.id" value="${implementation.url}"/>
@@ -37,15 +37,17 @@
<!-- ========= -->
<!-- Where source files live -->
- <property name="source.classes" value="${module.source}/main"/>
+ <property name="source.classes" value="${module.source}/main/java"/>
<property name="source.docs" value="${module.source}/docs"/>
<property name="source.etc" value="${module.source}/etc"/>
<property name="source.examples" value="${module.source}/examples"/>
<property name="source.bin" value="${module.source}/bin"/>
- <property name="source.resources" value="${module.source}/resources"/>
+ <property name="source.resources" value="${module.source}/main/resources"/>
<property name="source.stylesheets" value="${module.source}/stylesheets"/>
<property name="source.web" value="${module.source}/web"/>
<property name="source.test" value="${module.source}/test"/>
+ <property name="source.test.classes" value="${module.source}/test/java"/>
+ <property name="source.test.resources" value="${module.source}/test/resources"/>
<!-- Where build generated files will go -->
<property name="build.api" value="${module.output}/api"/>
@@ -68,7 +70,9 @@
<property name="build.log" value="${module.output}/log"/>
<property name="build.cache" value="${module.output}/cache"/>
<property name="build.test" value="${module.output}/test"/>
- <property name="build.gen.test" value="${build.gen}/test"/>
+ <property name="build.test.classes" value="${module.output}/test/classes"/>
+ <property name="build.test.resources" value="${module.output}/test/resources"/>
+ <property name="build.test.gen" value="${build.gen}/test/gen"/>
<!-- Legacy -->
<property name="build.metadata" value="${module.output}/metadata"/>
Modified: modules/test/trunk/tools/etc/buildfragments/defaults.ent
===================================================================
--- modules/test/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 14:26:14 UTC (rev 8410)
+++ modules/test/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 14:31:04 UTC (rev 8411)
@@ -20,15 +20,15 @@
<property name="version.cvstag" value="JBoss_4_0_0_DR3"/>
<!-- Manifest version info -->
- <property name="specification.title" value="JBoss"/>
- <property name="specification.version" value="${version.major}.${version.minor}"/>
- <property name="specification.vendor" value="JBoss Group, LLC (http://jboss.org)"/>
+ <property name="specification.title" value="JBoss Portal"/>
+ <property name="specification.version" value="${version.major}.${version.minor}.${version.revision}"/>
+ <property name="specification.vendor" value="Red Hat, Inc. (http://www.redhat.com)"/>
- <property name="implementation.title" value="JBoss [${version.name}]"/>
- <property name="implementation.url" value="http://jboss.org"/>
+ <property name="implementation.title" value="JBoss Portal ${version.name}"/>
+ <property name="implementation.url" value="http://labs.jboss.com/portal/jbossportal"/>
<property name="implementation.version"
- value="${version.major}.${version.minor}.${version.revision}${version.tag} (build: CVSTag=${version.cvstag} date=${build.id})"/>
- <property name="implementation.vendor" value="JBoss Group, LLC"/>
+ value="${version.major}.${version.minor}.${version.revision}.${version.tag} (date=${build.id})"/>
+ <property name="implementation.vendor" value="Red Hat, Inc."/>
<property name="implementation.vendor.id" value="${implementation.url}"/>
@@ -37,15 +37,17 @@
<!-- ========= -->
<!-- Where source files live -->
- <property name="source.classes" value="${module.source}/main"/>
+ <property name="source.classes" value="${module.source}/main/java"/>
<property name="source.docs" value="${module.source}/docs"/>
<property name="source.etc" value="${module.source}/etc"/>
<property name="source.examples" value="${module.source}/examples"/>
<property name="source.bin" value="${module.source}/bin"/>
- <property name="source.resources" value="${module.source}/resources"/>
+ <property name="source.resources" value="${module.source}/main/resources"/>
<property name="source.stylesheets" value="${module.source}/stylesheets"/>
<property name="source.web" value="${module.source}/web"/>
<property name="source.test" value="${module.source}/test"/>
+ <property name="source.test.classes" value="${module.source}/test/java"/>
+ <property name="source.test.resources" value="${module.source}/test/resources"/>
<!-- Where build generated files will go -->
<property name="build.api" value="${module.output}/api"/>
@@ -68,7 +70,9 @@
<property name="build.log" value="${module.output}/log"/>
<property name="build.cache" value="${module.output}/cache"/>
<property name="build.test" value="${module.output}/test"/>
- <property name="build.gen.test" value="${build.gen}/test"/>
+ <property name="build.test.classes" value="${module.output}/test/classes"/>
+ <property name="build.test.resources" value="${module.output}/test/resources"/>
+ <property name="build.test.gen" value="${build.gen}/test/gen"/>
<!-- Legacy -->
<property name="build.metadata" value="${module.output}/metadata"/>
Modified: modules/web/trunk/tools/etc/buildfragments/defaults.ent
===================================================================
--- modules/web/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 14:26:14 UTC (rev 8410)
+++ modules/web/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 14:31:04 UTC (rev 8411)
@@ -20,15 +20,15 @@
<property name="version.cvstag" value="JBoss_4_0_0_DR3"/>
<!-- Manifest version info -->
- <property name="specification.title" value="JBoss"/>
- <property name="specification.version" value="${version.major}.${version.minor}"/>
- <property name="specification.vendor" value="JBoss Group, LLC (http://jboss.org)"/>
+ <property name="specification.title" value="JBoss Portal"/>
+ <property name="specification.version" value="${version.major}.${version.minor}.${version.revision}"/>
+ <property name="specification.vendor" value="Red Hat, Inc. (http://www.redhat.com)"/>
- <property name="implementation.title" value="JBoss [${version.name}]"/>
- <property name="implementation.url" value="http://jboss.org"/>
+ <property name="implementation.title" value="JBoss Portal ${version.name}"/>
+ <property name="implementation.url" value="http://labs.jboss.com/portal/jbossportal"/>
<property name="implementation.version"
- value="${version.major}.${version.minor}.${version.revision}${version.tag} (build: CVSTag=${version.cvstag} date=${build.id})"/>
- <property name="implementation.vendor" value="JBoss Group, LLC"/>
+ value="${version.major}.${version.minor}.${version.revision}.${version.tag} (date=${build.id})"/>
+ <property name="implementation.vendor" value="Red Hat, Inc."/>
<property name="implementation.vendor.id" value="${implementation.url}"/>
@@ -37,15 +37,17 @@
<!-- ========= -->
<!-- Where source files live -->
- <property name="source.classes" value="${module.source}/main"/>
+ <property name="source.classes" value="${module.source}/main/java"/>
<property name="source.docs" value="${module.source}/docs"/>
<property name="source.etc" value="${module.source}/etc"/>
<property name="source.examples" value="${module.source}/examples"/>
<property name="source.bin" value="${module.source}/bin"/>
- <property name="source.resources" value="${module.source}/resources"/>
+ <property name="source.resources" value="${module.source}/main/resources"/>
<property name="source.stylesheets" value="${module.source}/stylesheets"/>
<property name="source.web" value="${module.source}/web"/>
<property name="source.test" value="${module.source}/test"/>
+ <property name="source.test.classes" value="${module.source}/test/java"/>
+ <property name="source.test.resources" value="${module.source}/test/resources"/>
<!-- Where build generated files will go -->
<property name="build.api" value="${module.output}/api"/>
@@ -68,7 +70,9 @@
<property name="build.log" value="${module.output}/log"/>
<property name="build.cache" value="${module.output}/cache"/>
<property name="build.test" value="${module.output}/test"/>
- <property name="build.gen.test" value="${build.gen}/test"/>
+ <property name="build.test.classes" value="${module.output}/test/classes"/>
+ <property name="build.test.resources" value="${module.output}/test/resources"/>
+ <property name="build.test.gen" value="${build.gen}/test/gen"/>
<!-- Legacy -->
<property name="build.metadata" value="${module.output}/metadata"/>
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8410 - in modules: common/trunk/build and 33 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-21 10:26:14 -0400 (Fri, 21 Sep 2007)
New Revision: 8410
Added:
modules/common/trunk/mc/src/etc/
modules/common/trunk/mc/src/etc/portal-common-mc-lib-jar.mf
modules/common/trunk/portal/src/etc/
modules/common/trunk/portal/src/etc/portal-common-portal-lib-jar.mf
modules/identity/trunk/identity/src/etc/portal-identity-lib-jar.mf
modules/identity/trunk/sso/src/etc/portal-identity-sso-lib-jar.mf
modules/portlet/trunk/bridge/src/etc/
modules/portlet/trunk/bridge/src/etc/portal-bridge-lib-jar.mf
modules/portlet/trunk/federation/src/etc/
modules/portlet/trunk/federation/src/etc/portal-federation-lib-jar.mf
modules/portlet/trunk/jsr168api/src/etc/
modules/portlet/trunk/jsr168api/src/etc/portal-jsr168api-lib-jar.mf
modules/portlet/trunk/management/src/etc/
modules/portlet/trunk/management/src/etc/portal-management-lib-jar.mf
modules/portlet/trunk/portlet/src/etc/
modules/portlet/trunk/portlet/src/etc/portal-portlet-lib-jar.mf
modules/portlet/trunk/test/src/etc/
modules/portlet/trunk/test/src/etc/portal-test-lib-jar.mf
modules/web/trunk/web/src/etc/
modules/web/trunk/web/src/etc/portal-web-lib-jar.mf
Removed:
modules/identity/trunk/identity/src/etc/portal-common-lib-jar.mf
Modified:
modules/common/trunk/.classpath
modules/common/trunk/build/build.xml
modules/common/trunk/mc/build.xml
modules/common/trunk/portal/build.xml
modules/common/trunk/tools/etc/buildfragments/defaults.ent
modules/identity/trunk/build/build.xml
modules/identity/trunk/identity/build.xml
modules/identity/trunk/sso/build.xml
modules/portlet/trunk/bridge/build.xml
modules/portlet/trunk/federation/build.xml
modules/portlet/trunk/jsr168api/build.xml
modules/portlet/trunk/management/build.xml
modules/portlet/trunk/portlet/build.xml
modules/portlet/trunk/test/build.xml
modules/web/trunk/web/build.xml
Log:
Adding manifests to the jars
Modified: modules/common/trunk/.classpath
===================================================================
--- modules/common/trunk/.classpath 2007-09-21 13:49:39 UTC (rev 8409)
+++ modules/common/trunk/.classpath 2007-09-21 14:26:14 UTC (rev 8410)
@@ -2,9 +2,18 @@
<classpath>
<classpathentry kind="src" path="mc/src/main/java"/>
<classpathentry kind="src" path="portal/src/main/java"/>
+ <classpathentry kind="src" path="common/src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/>
<classpathentry kind="lib" path="thirdparty/sun-servlet/lib/servlet-api.jar"/>
<classpathentry kind="lib" path="thirdparty/apache-log4j/lib/log4j.jar"/>
+ <classpathentry kind="lib" path="thirdparty/apache-ant/lib/ant.jar"/>
+ <classpathentry kind="lib" path="tools/lib/cargo-core-uberjar-0.8.jar"/>
+ <classpathentry kind="lib" path="thirdparty/oswego-concurrent/lib/concurrent.jar"/>
+ <classpathentry kind="lib" path="thirdparty/junit/lib/junit.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/>
+ <classpathentry kind="lib" path="tools/lib/ant-junit.jar"/>
+ <classpathentry kind="lib" path="thirdparty/apache-httpclient/lib/commons-httpclient.jar"/>
+ <classpathentry kind="lib" path="thirdparty/sun-jaf/lib/activation.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: modules/common/trunk/build/build.xml
===================================================================
--- modules/common/trunk/build/build.xml 2007-09-21 13:49:39 UTC (rev 8409)
+++ modules/common/trunk/build/build.xml 2007-09-21 14:26:14 UTC (rev 8410)
@@ -66,7 +66,7 @@
<property name="version.name" value=""/>
<!-- This must be set to the CVS tag for any release -->
- <property name="version.cvstag" value="HEAD"/>
+ <property name="version.cvstag" value=""/>
<!-- Module name(s) & version -->
<property name="module.version"
Modified: modules/common/trunk/mc/build.xml
===================================================================
--- modules/common/trunk/mc/build.xml 2007-09-21 13:49:39 UTC (rev 8409)
+++ modules/common/trunk/mc/build.xml 2007-09-21 14:26:14 UTC (rev 8410)
@@ -146,7 +146,7 @@
<mkdir dir="${build.lib}"/>
- <jar jarfile="${build.lib}/portal-common-mc-lib.jar">
+ <jar jarfile="${build.lib}/portal-common-mc-lib.jar" manifest="${build.etc}/portal-common-mc-lib-jar.mf">
<fileset dir="${build.classes}"/>
</jar>
Added: modules/common/trunk/mc/src/etc/portal-common-mc-lib-jar.mf
===================================================================
--- modules/common/trunk/mc/src/etc/portal-common-mc-lib-jar.mf (rev 0)
+++ modules/common/trunk/mc/src/etc/portal-common-mc-lib-jar.mf 2007-09-21 14:26:14 UTC (rev 8410)
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Created-By: @java.vm.version@ (@java.vm.vendor@)
+Specification-Title: @specification.title@
+Specification-Version: @specification.version@
+Specification-Vendor: @specification.vendor@
+Implementation-Title: @implementation.title@
+Implementation-URL: @implementation.url@
+Implementation-Version: @implementation.version@
+Implementation-Vendor: @implementation.vendor@
+Implementation-Vendor-Id: @implementation.vendor.id@
Property changes on: modules/common/trunk/mc/src/etc/portal-common-mc-lib-jar.mf
___________________________________________________________________
Name: svn:executable
+ *
Modified: modules/common/trunk/portal/build.xml
===================================================================
--- modules/common/trunk/portal/build.xml 2007-09-21 13:49:39 UTC (rev 8409)
+++ modules/common/trunk/portal/build.xml 2007-09-21 14:26:14 UTC (rev 8410)
@@ -142,7 +142,7 @@
<mkdir dir="${build.lib}"/>
- <jar jarfile="${build.lib}/portal-common-portal-lib.jar">
+ <jar jarfile="${build.lib}/portal-common-portal-lib.jar" manifest="${build.etc}/portal-common-portal-lib-jar.mf">
<fileset dir="${build.classes}"/>
</jar>
Added: modules/common/trunk/portal/src/etc/portal-common-portal-lib-jar.mf
===================================================================
--- modules/common/trunk/portal/src/etc/portal-common-portal-lib-jar.mf (rev 0)
+++ modules/common/trunk/portal/src/etc/portal-common-portal-lib-jar.mf 2007-09-21 14:26:14 UTC (rev 8410)
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Created-By: @java.vm.version@ (@java.vm.vendor@)
+Specification-Title: @specification.title@
+Specification-Version: @specification.version@
+Specification-Vendor: @specification.vendor@
+Implementation-Title: @implementation.title@
+Implementation-URL: @implementation.url@
+Implementation-Version: @implementation.version@
+Implementation-Vendor: @implementation.vendor@
+Implementation-Vendor-Id: @implementation.vendor.id@
Property changes on: modules/common/trunk/portal/src/etc/portal-common-portal-lib-jar.mf
___________________________________________________________________
Name: svn:executable
+ *
Modified: modules/common/trunk/tools/etc/buildfragments/defaults.ent
===================================================================
--- modules/common/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 13:49:39 UTC (rev 8409)
+++ modules/common/trunk/tools/etc/buildfragments/defaults.ent 2007-09-21 14:26:14 UTC (rev 8410)
@@ -20,15 +20,15 @@
<property name="version.cvstag" value="JBoss_4_0_0_DR3"/>
<!-- Manifest version info -->
- <property name="specification.title" value="JBoss"/>
- <property name="specification.version" value="${version.major}.${version.minor}"/>
- <property name="specification.vendor" value="JBoss Group, LLC (http://jboss.org)"/>
+ <property name="specification.title" value="JBoss Portal"/>
+ <property name="specification.version" value="${version.major}.${version.minor}.${version.revision}"/>
+ <property name="specification.vendor" value="Red Hat, Inc. (http://www.redhat.com)"/>
- <property name="implementation.title" value="JBoss [${version.name}]"/>
- <property name="implementation.url" value="http://jboss.org"/>
+ <property name="implementation.title" value="JBoss Portal ${version.name}"/>
+ <property name="implementation.url" value="http://labs.jboss.com/portal/jbossportal"/>
<property name="implementation.version"
- value="${version.major}.${version.minor}.${version.revision}${version.tag} (build: CVSTag=${version.cvstag} date=${build.id})"/>
- <property name="implementation.vendor" value="JBoss Group, LLC"/>
+ value="${version.major}.${version.minor}.${version.revision}.${version.tag} (date=${build.id})"/>
+ <property name="implementation.vendor" value="Red Hat, Inc."/>
<property name="implementation.vendor.id" value="${implementation.url}"/>
Modified: modules/identity/trunk/build/build.xml
===================================================================
--- modules/identity/trunk/build/build.xml 2007-09-21 13:49:39 UTC (rev 8409)
+++ modules/identity/trunk/build/build.xml 2007-09-21 14:26:14 UTC (rev 8410)
@@ -59,11 +59,11 @@
<!--| Project version information. |-->
<!--+==============================+-->
- <property name="version.major" value="2"/>
- <property name="version.minor" value="6"/>
+ <property name="version.major" value="1"/>
+ <property name="version.minor" value="0"/>
<property name="version.revision" value="0"/>
- <property name="version.tag" value="A"/>
- <property name="version.name" value="Ninja"/>
+ <property name="version.tag" value="GA"/>
+ <property name="version.name" value=""/>
<!-- This must be set to the CVS tag for any release -->
<property name="version.cvstag" value="HEAD"/>
Modified: modules/identity/trunk/identity/build.xml
===================================================================
--- modules/identity/trunk/identity/build.xml 2007-09-21 13:49:39 UTC (rev 8409)
+++ modules/identity/trunk/identity/build.xml 2007-09-21 14:26:14 UTC (rev 8410)
@@ -237,7 +237,7 @@
description="Generate all target output."
depends="compile">
<mkdir dir="${build.lib}"/>
- <jar jarfile="${build.lib}/portal-identity-lib.jar">
+ <jar jarfile="${build.lib}/portal-identity-lib.jar" manifest="${build.etc}/portal-identity-lib-jar.mf">
<fileset dir="${build.classes}" excludes="org/jboss/portal/test/**"/>
</jar>
<copy file="${build.resources}/hibernate/domain.hbm.xml"
Deleted: modules/identity/trunk/identity/src/etc/portal-common-lib-jar.mf
===================================================================
--- modules/identity/trunk/identity/src/etc/portal-common-lib-jar.mf 2007-09-21 13:49:39 UTC (rev 8409)
+++ modules/identity/trunk/identity/src/etc/portal-common-lib-jar.mf 2007-09-21 14:26:14 UTC (rev 8410)
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Created-By: @java.vm.version@ (@java.vm.vendor@)
-Specification-Title: @specification.title@
-Specification-Version: @specification.version@
-Specification-Vendor: @specification.vendor@
-Implementation-Title: @implementation.title@
-Implementation-URL: @implementation.url@
-Implementation-Version: @implementation.version@
-Implementation-Vendor: @implementation.vendor@
-Implementation-Vendor-Id: @implementation.vendor.id@
Copied: modules/identity/trunk/identity/src/etc/portal-identity-lib-jar.mf (from rev 8406, modules/identity/trunk/identity/src/etc/portal-common-lib-jar.mf)
===================================================================
--- modules/identity/trunk/identity/src/etc/portal-identity-lib-jar.mf (rev 0)
+++ modules/identity/trunk/identity/src/etc/portal-identity-lib-jar.mf 2007-09-21 14:26:14 UTC (rev 8410)
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Created-By: @java.vm.version@ (@java.vm.vendor@)
+Specification-Title: @specification.title@
+Specification-Version: @specification.version@
+Specification-Vendor: @specification.vendor@
+Implementation-Title: @implementation.title@
+Implementation-URL: @implementation.url@
+Implementation-Version: @implementation.version@
+Implementation-Vendor: @implementation.vendor@
+Implementation-Vendor-Id: @implementation.vendor.id@
Modified: modules/identity/trunk/sso/build.xml
===================================================================
--- modules/identity/trunk/sso/build.xml 2007-09-21 13:49:39 UTC (rev 8409)
+++ modules/identity/trunk/sso/build.xml 2007-09-21 14:26:14 UTC (rev 8410)
@@ -206,7 +206,7 @@
description="Generate all target output."
depends="compile">
<mkdir dir="${build.lib}"/>
- <jar jarfile="${build.lib}/portal-identity-sso-lib.jar">
+ <jar jarfile="${build.lib}/portal-identity-sso-lib.jar" manifest="${build.etc}/portal-identity-sso-lib-jar.mf">
<fileset dir="${build.classes}" excludes="org/jboss/portal/test/**"/>
</jar>
@@ -218,7 +218,7 @@
<fileset dir="${cas.cas.lib}" includes="casclient.jar"/>
<fileset dir="${build.lib}" includes="portal-identity-sso-lib.jar"/>
</copy>
- <jar jarfile="${build.lib}/portal-cas.sar">
+ <jar jarfile="${build.lib}/portal-cas.sar" manifest="${build.etc}/portal-identity-sso-lib-jar.mf">
<fileset dir="${build.resources}/portal-cas-sso.sar"/>
</jar>
@@ -229,7 +229,7 @@
<fileset dir="${cas.cas.lib}" includes="casclient-lenient.jar"/>
<fileset dir="${build.lib}" includes="portal-identity-sso-lib.jar"/>
</copy>
- <jar jarfile="${build.lib}/portal-cas-lenient.sar">
+ <jar jarfile="${build.lib}/portal-cas-lenient.sar" manifest="${build.etc}/portal-identity-sso-lib-jar.mf">
<fileset dir="${build.resources}/portal-caslenient-sso.sar"/>
</jar>
@@ -240,7 +240,7 @@
<copy todir="${build.resources}/portal-josso-sso.sar/lib" overwrite="true">
<fileset dir="${build.lib}" includes="portal-identity-sso-lib.jar"/>
</copy>
- <jar jarfile="${build.lib}/portal-josso.sar">
+ <jar jarfile="${build.lib}/portal-josso.sar" manifest="${build.etc}/portal-identity-sso-lib-jar.mf">
<fileset dir="${build.resources}/portal-josso-sso.sar"/>
</jar>
</target>
Added: modules/identity/trunk/sso/src/etc/portal-identity-sso-lib-jar.mf
===================================================================
--- modules/identity/trunk/sso/src/etc/portal-identity-sso-lib-jar.mf (rev 0)
+++ modules/identity/trunk/sso/src/etc/portal-identity-sso-lib-jar.mf 2007-09-21 14:26:14 UTC (rev 8410)
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Created-By: @java.vm.version@ (@java.vm.vendor@)
+Specification-Title: @specification.title@
+Specification-Version: @specification.version@
+Specification-Vendor: @specification.vendor@
+Implementation-Title: @implementation.title@
+Implementation-URL: @implementation.url@
+Implementation-Version: @implementation.version@
+Implementation-Vendor: @implementation.vendor@
+Implementation-Vendor-Id: @implementation.vendor.id@
Property changes on: modules/identity/trunk/sso/src/etc/portal-identity-sso-lib-jar.mf
___________________________________________________________________
Name: svn:executable
+ *
Modified: modules/portlet/trunk/bridge/build.xml
===================================================================
--- modules/portlet/trunk/bridge/build.xml 2007-09-21 13:49:39 UTC (rev 8409)
+++ modules/portlet/trunk/bridge/build.xml 2007-09-21 14:26:14 UTC (rev 8410)
@@ -148,7 +148,7 @@
<mkdir dir="${build.lib}"/>
- <jar jarfile="${build.lib}/portal-portlet-bridge-lib.jar">
+ <jar jarfile="${build.lib}/portal-portlet-bridge-lib.jar" manifest="${build.etc}/portal-bridge-lib-jar.mf">
<fileset dir="${build.classes}"/>
</jar>
Added: modules/portlet/trunk/bridge/src/etc/portal-bridge-lib-jar.mf
===================================================================
--- modules/portlet/trunk/bridge/src/etc/portal-bridge-lib-jar.mf (rev 0)
+++ modules/portlet/trunk/bridge/src/etc/portal-bridge-lib-jar.mf 2007-09-21 14:26:14 UTC (rev 8410)
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Created-By: @java.vm.version@ (@java.vm.vendor@)
+Specification-Title: @specification.title@
+Specification-Version: @specification.version@
+Specification-Vendor: @specification.vendor@
+Implementation-Title: @implementation.title@
+Implementation-URL: @implementation.url@
+Implementation-Version: @implementation.version@
+Implementation-Vendor: @implementation.vendor@
+Implementation-Vendor-Id: @implementation.vendor.id@
Property changes on: modules/portlet/trunk/bridge/src/etc/portal-bridge-lib-jar.mf
___________________________________________________________________
Name: svn:executable
+ *
Modified: modules/portlet/trunk/federation/build.xml
===================================================================
--- modules/portlet/trunk/federation/build.xml 2007-09-21 13:49:39 UTC (rev 8409)
+++ modules/portlet/trunk/federation/build.xml 2007-09-21 14:26:14 UTC (rev 8410)
@@ -148,7 +148,7 @@
<mkdir dir="${build.lib}"/>
<!-- Federation lib jar -->
- <jar jarfile="${build.lib}/portal-portlet-federation-lib.jar">
+ <jar jarfile="${build.lib}/portal-portlet-federation-lib.jar" manifest="${build.etc}/portal-federation-lib-jar.mf">
<fileset dir="${build.classes}">
<exclude name="org/jboss/portal/test/**"/>
</fileset>
Added: modules/portlet/trunk/federation/src/etc/portal-federation-lib-jar.mf
===================================================================
--- modules/portlet/trunk/federation/src/etc/portal-federation-lib-jar.mf (rev 0)
+++ modules/portlet/trunk/federation/src/etc/portal-federation-lib-jar.mf 2007-09-21 14:26:14 UTC (rev 8410)
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Created-By: @java.vm.version@ (@java.vm.vendor@)
+Specification-Title: @specification.title@
+Specification-Version: @specification.version@
+Specification-Vendor: @specification.vendor@
+Implementation-Title: @implementation.title@
+Implementation-URL: @implementation.url@
+Implementation-Version: @implementation.version@
+Implementation-Vendor: @implementation.vendor@
+Implementation-Vendor-Id: @implementation.vendor.id@
Property changes on: modules/portlet/trunk/federation/src/etc/portal-federation-lib-jar.mf
___________________________________________________________________
Name: svn:executable
+ *
Modified: modules/portlet/trunk/jsr168api/build.xml
===================================================================
--- modules/portlet/trunk/jsr168api/build.xml 2007-09-21 13:49:39 UTC (rev 8409)
+++ modules/portlet/trunk/jsr168api/build.xml 2007-09-21 14:26:14 UTC (rev 8410)
@@ -142,7 +142,7 @@
<mkdir dir="${build.lib}"/>
- <jar jarfile="${build.lib}/portal-portlet-jsr168api-lib.jar">
+ <jar jarfile="${build.lib}/portal-portlet-jsr168api-lib.jar" manifest="${build.etc}/portal-jsr168api-lib-jar.mf">
<fileset dir="${build.classes}"/>
</jar>
Added: modules/portlet/trunk/jsr168api/src/etc/portal-jsr168api-lib-jar.mf
===================================================================
--- modules/portlet/trunk/jsr168api/src/etc/portal-jsr168api-lib-jar.mf (rev 0)
+++ modules/portlet/trunk/jsr168api/src/etc/portal-jsr168api-lib-jar.mf 2007-09-21 14:26:14 UTC (rev 8410)
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Created-By: @java.vm.version@ (@java.vm.vendor@)
+Specification-Title: @specification.title@
+Specification-Version: @specification.version@
+Specification-Vendor: @specification.vendor@
+Implementation-Title: @implementation.title@
+Implementation-URL: @implementation.url@
+Implementation-Version: @implementation.version@
+Implementation-Vendor: @implementation.vendor@
+Implementation-Vendor-Id: @implementation.vendor.id@
Property changes on: modules/portlet/trunk/jsr168api/src/etc/portal-jsr168api-lib-jar.mf
___________________________________________________________________
Name: svn:executable
+ *
Modified: modules/portlet/trunk/management/build.xml
===================================================================
--- modules/portlet/trunk/management/build.xml 2007-09-21 13:49:39 UTC (rev 8409)
+++ modules/portlet/trunk/management/build.xml 2007-09-21 14:26:14 UTC (rev 8410)
@@ -146,7 +146,7 @@
<mkdir dir="${build.lib}"/>
<!-- Portlet management lib jar -->
- <jar jarfile="${build.lib}/portal-portlet-management-lib.jar">
+ <jar jarfile="${build.lib}/portal-portlet-management-lib.jar" manifest="${build.etc}/portal-management-lib-jar.mf">
<fileset dir="${build.classes}">
</fileset>
</jar>
Added: modules/portlet/trunk/management/src/etc/portal-management-lib-jar.mf
===================================================================
--- modules/portlet/trunk/management/src/etc/portal-management-lib-jar.mf (rev 0)
+++ modules/portlet/trunk/management/src/etc/portal-management-lib-jar.mf 2007-09-21 14:26:14 UTC (rev 8410)
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Created-By: @java.vm.version@ (@java.vm.vendor@)
+Specification-Title: @specification.title@
+Specification-Version: @specification.version@
+Specification-Vendor: @specification.vendor@
+Implementation-Title: @implementation.title@
+Implementation-URL: @implementation.url@
+Implementation-Version: @implementation.version@
+Implementation-Vendor: @implementation.vendor@
+Implementation-Vendor-Id: @implementation.vendor.id@
Property changes on: modules/portlet/trunk/management/src/etc/portal-management-lib-jar.mf
___________________________________________________________________
Name: svn:executable
+ *
Modified: modules/portlet/trunk/portlet/build.xml
===================================================================
--- modules/portlet/trunk/portlet/build.xml 2007-09-21 13:49:39 UTC (rev 8409)
+++ modules/portlet/trunk/portlet/build.xml 2007-09-21 14:26:14 UTC (rev 8410)
@@ -151,7 +151,7 @@
<mkdir dir="${build.lib}"/>
<!-- Portlet lib jar -->
- <jar jarfile="${build.lib}/portal-portlet-lib.jar">
+ <jar jarfile="${build.lib}/portal-portlet-lib.jar" manifest="${build.etc}/portal-portlet-lib-jar.mf">
<fileset dir="${build.classes}">
<exclude name="org/jboss/portal/test/**"/>
</fileset>
@@ -159,12 +159,12 @@
</jar>
<!-- Portlet test lib jar -->
- <jar jarfile="${build.lib}/portal-portlet-test-lib.jar">
+ <jar jarfile="${build.lib}/portal-portlet-test-lib.jar" manifest="${build.etc}/portal-portlet-lib-jar.mf">
<fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/**"/>
</jar>
<!-- Portlet test framework lib jar -->
- <jar jarfile="${build.lib}/portal-portlet-test-framework-lib.jar">
+ <jar jarfile="${build.lib}/portal-portlet-test-framework-lib.jar" manifest="${build.etc}/portal-portlet-lib-jar.mf">
<fileset dir="${build.classes}" includes="org/jboss/portal/test/framework/portlet/**"/>
</jar>
</target>
Added: modules/portlet/trunk/portlet/src/etc/portal-portlet-lib-jar.mf
===================================================================
--- modules/portlet/trunk/portlet/src/etc/portal-portlet-lib-jar.mf (rev 0)
+++ modules/portlet/trunk/portlet/src/etc/portal-portlet-lib-jar.mf 2007-09-21 14:26:14 UTC (rev 8410)
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Created-By: @java.vm.version@ (@java.vm.vendor@)
+Specification-Title: @specification.title@
+Specification-Version: @specification.version@
+Specification-Vendor: @specification.vendor@
+Implementation-Title: @implementation.title@
+Implementation-URL: @implementation.url@
+Implementation-Version: @implementation.version@
+Implementation-Vendor: @implementation.vendor@
+Implementation-Vendor-Id: @implementation.vendor.id@
Property changes on: modules/portlet/trunk/portlet/src/etc/portal-portlet-lib-jar.mf
___________________________________________________________________
Name: svn:executable
+ *
Modified: modules/portlet/trunk/test/build.xml
===================================================================
--- modules/portlet/trunk/test/build.xml 2007-09-21 13:49:39 UTC (rev 8409)
+++ modules/portlet/trunk/test/build.xml 2007-09-21 14:26:14 UTC (rev 8410)
@@ -154,7 +154,7 @@
<mkdir dir="${build.lib}"/>
<!-- Portlet lib jar -->
- <jar jarfile="${build.lib}/portlet-test-lib.jar">
+ <jar jarfile="${build.lib}/portlet-test-lib.jar" manifest="${build.etc}/portal-test-lib-jar.mf">
<fileset dir="${build.classes}"/>
</jar>
@@ -180,7 +180,7 @@
</copy>
<mkdir dir="${build.lib}/jboss-4.2"/>
- <jar jarfile="${build.lib}/jboss-4.2/portlet-test.war">
+ <jar jarfile="${build.lib}/jboss-4.2/portlet-test.war" manifest="${build.etc}/portal-test-lib-jar.mf">
<fileset dir="${build.resources}/jboss-4.2/portlet-test-war"/>
<fileset dir="${build.resources}/portlet-test-war"/>
</jar>
@@ -209,7 +209,7 @@
</copy>
<mkdir dir="${build.lib}/tomcat-6.0"/>
- <jar jarfile="${build.lib}/tomcat-6.0/portlet-test.war">
+ <jar jarfile="${build.lib}/tomcat-6.0/portlet-test.war" manifest="${build.etc}/portal-test-lib-jar.mf">
<fileset dir="${build.resources}/tomcat-6.0/portlet-test-war"/>
<fileset dir="${build.resources}/portlet-test-war"/>
</jar>
Added: modules/portlet/trunk/test/src/etc/portal-test-lib-jar.mf
===================================================================
--- modules/portlet/trunk/test/src/etc/portal-test-lib-jar.mf (rev 0)
+++ modules/portlet/trunk/test/src/etc/portal-test-lib-jar.mf 2007-09-21 14:26:14 UTC (rev 8410)
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Created-By: @java.vm.version@ (@java.vm.vendor@)
+Specification-Title: @specification.title@
+Specification-Version: @specification.version@
+Specification-Vendor: @specification.vendor@
+Implementation-Title: @implementation.title@
+Implementation-URL: @implementation.url@
+Implementation-Version: @implementation.version@
+Implementation-Vendor: @implementation.vendor@
+Implementation-Vendor-Id: @implementation.vendor.id@
Property changes on: modules/portlet/trunk/test/src/etc/portal-test-lib-jar.mf
___________________________________________________________________
Name: svn:executable
+ *
Modified: modules/web/trunk/web/build.xml
===================================================================
--- modules/web/trunk/web/build.xml 2007-09-21 13:49:39 UTC (rev 8409)
+++ modules/web/trunk/web/build.xml 2007-09-21 14:26:14 UTC (rev 8410)
@@ -149,7 +149,7 @@
<mkdir dir="${build.lib}"/>
<!-- portal-web.jar -->
- <jar jarfile="${build.lib}/portal-web-lib.jar">
+ <jar jarfile="${build.lib}/portal-web-lib.jar" manifest="${build.etc}/portal-web-lib-jar.mf">
<fileset dir="${build.classes}"/>
</jar>
Added: modules/web/trunk/web/src/etc/portal-web-lib-jar.mf
===================================================================
--- modules/web/trunk/web/src/etc/portal-web-lib-jar.mf (rev 0)
+++ modules/web/trunk/web/src/etc/portal-web-lib-jar.mf 2007-09-21 14:26:14 UTC (rev 8410)
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Created-By: @java.vm.version@ (@java.vm.vendor@)
+Specification-Title: @specification.title@
+Specification-Version: @specification.version@
+Specification-Vendor: @specification.vendor@
+Implementation-Title: @implementation.title@
+Implementation-URL: @implementation.url@
+Implementation-Version: @implementation.version@
+Implementation-Vendor: @implementation.vendor@
+Implementation-Vendor-Id: @implementation.vendor.id@
Property changes on: modules/web/trunk/web/src/etc/portal-web-lib-jar.mf
___________________________________________________________________
Name: svn:executable
+ *
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8409 - in docs/trunk: userGuide/en/modules and 1 other directory.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-21 09:49:39 -0400 (Fri, 21 Sep 2007)
New Revision: 8409
Modified:
docs/trunk/referenceGuide/en/modules/identityportlets.xml
docs/trunk/userGuide/en/modules/user_role.xml
Log:
corrected image caption
Modified: docs/trunk/referenceGuide/en/modules/identityportlets.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/identityportlets.xml 2007-09-21 13:26:01 UTC (rev 8408)
+++ docs/trunk/referenceGuide/en/modules/identityportlets.xml 2007-09-21 13:49:39 UTC (rev 8409)
@@ -193,7 +193,7 @@
</note>
<warning>
Make sure that the application server is restarted after re-deploying the Identity Portlets. This is required to make sure that
- the registration process works properly!
+ the registration and approval process works properly!
</warning>
<para></para>
<mediaobject>
@@ -822,7 +822,7 @@
<para>
When migrating from former versions of JBoss Portal the Identity User Portlets won't be displayed by default,
but Windows can be created on basis of the existing Portlet Instances which are deployed by default. (The instances
- names being <literal>IdentityUserPortletInstance</literal> and <literal>IdentityAdminPortletInstance</literal>).
+ names being <literal>IdentityUserPortletInstance</literal> and <literal>IdentityAdminPortletInstance</literal>.)
</para>
</sect2>
</sect1>
Modified: docs/trunk/userGuide/en/modules/user_role.xml
===================================================================
--- docs/trunk/userGuide/en/modules/user_role.xml 2007-09-21 13:26:01 UTC (rev 8408)
+++ docs/trunk/userGuide/en/modules/user_role.xml 2007-09-21 13:49:39 UTC (rev 8409)
@@ -159,6 +159,7 @@
<para> A role will be used to grant different permission levels to different portlets, pages, or portal instances. A user can have several roles.
</para>
<para>
+ <mediaobject>
<imageobject>
<imagedata fileref="images/role/role_management.png" format="png" align="center" valign="middle"/>
</imageobject>
@@ -167,6 +168,7 @@
Role management.
</para>
</caption>
+ </mediaobject>
</para>
</sect2>
<sect2>
16 years, 9 months
- 1
- 0
JBoss Portal SVN: r8408 - modules/common/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-21 09:26:01 -0400 (Fri, 21 Sep 2007)
New Revision: 8408
Added:
modules/common/tags/1_0_0/
Log:
Tagging common module
Copied: modules/common/tags/1_0_0 (from rev 8407, modules/common/trunk)
16 years, 9 months
- 1
- 0