gatein SVN: r6085 - in components/wsrp/trunk: common/src/main/java/org/gatein/wsrp and 4 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-03-17 16:42:23 -0400 (Thu, 17 Mar 2011)
New Revision: 6085
Removed:
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/jcr/mapping/Utils.java
Modified:
components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPConstants.java
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/migration/mapping/ExportInfoMapping.java
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/RegistrationInfoMapping.java
components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/RegistrationMapping.java
components/wsrp/trunk/pom.xml
Log:
- GTNWSRP-90: Upgraded to Common 2.0.4-Beta02.
Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPConstants.java
===================================================================
--- components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPConstants.java 2011-03-17 20:24:57 UTC (rev 6084)
+++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPConstants.java 2011-03-17 20:42:23 UTC (rev 6085)
@@ -23,6 +23,7 @@
package org.gatein.wsrp;
+import org.gatein.common.RuntimeContext;
import org.gatein.pc.api.spi.PortalContext;
import javax.xml.namespace.QName;
@@ -43,8 +44,7 @@
*/
public final class WSRPConstants
{
- // public static final boolean RUNS_IN_EPP = RuntimeContext.getInstance().isRunningIn(RuntimeContext.RunningEnvironment.epp); // todo: GTNWSRP-90: Use RuntimeContext from common when possible
- public static final boolean RUNS_IN_EPP;
+ public static final boolean RUNS_IN_EPP = RuntimeContext.getInstance().isRunningIn(RuntimeContext.RunningEnvironment.epp);
/**
* The version of the WSRP service. This should match the maven version of the module. Right now, checked via the
@@ -52,8 +52,6 @@
*/
public static final String WSRP_SERVICE_VERSION;
- private static final String GATEIN_RUNTIME_CONTEXT_PROP_NAME = "gatein.runtime.context"; // todo: remove when GTNWSRP-90 is fixed
-
static
{
Properties props = new Properties();
@@ -66,8 +64,6 @@
throw new RuntimeException("Could not load wsrp.properties.");
}
WSRP_SERVICE_VERSION = props.getProperty("wsrp.service.version");
-
- RUNS_IN_EPP = "epp".equals(System.getProperty(GATEIN_RUNTIME_CONTEXT_PROP_NAME)); // todo: remove when GTNWSRP-90 is fixed
}
Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/migration/mapping/ExportInfoMapping.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/migration/mapping/ExportInfoMapping.java 2011-03-17 20:24:57 UTC (rev 6084)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/migration/mapping/ExportInfoMapping.java 2011-03-17 20:42:23 UTC (rev 6085)
@@ -27,10 +27,10 @@
import org.chromattic.api.annotations.OneToMany;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
+import org.gatein.common.io.IOTools;
import org.gatein.wsrp.consumer.migration.ExportInfo;
import org.gatein.wsrp.jcr.ChromatticPersister;
import org.gatein.wsrp.jcr.mapping.BaseMapping;
-import org.gatein.wsrp.jcr.mapping.Utils;
import javax.xml.namespace.QName;
import java.io.ByteArrayInputStream;
@@ -128,7 +128,7 @@
SortedMap<String, byte[]> states = new TreeMap<String, byte[]>();
for (ExportedStateMapping exportedState : exportedStates)
{
- states.put(ChromatticPersister.PortletNameFormatter.decode(exportedState.getHandle()), Utils.safeGetBytes(exportedState.getState()));
+ states.put(ChromatticPersister.PortletNameFormatter.decode(exportedState.getHandle()), IOTools.safeGetBytes(exportedState.getState()));
}
List<ExportErrorMapping> errors = getErrors();
@@ -138,6 +138,6 @@
errorCodesToHandles.put(error.getErrorCode(), error.getPortletHandles());
}
- return new ExportInfo(getExportTime(), errorCodesToHandles, states, Utils.safeGetBytes(getExportContext()));
+ return new ExportInfo(getExportTime(), errorCodesToHandles, states, IOTools.safeGetBytes(getExportContext()));
}
}
Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/RegistrationInfoMapping.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/RegistrationInfoMapping.java 2011-03-17 20:24:57 UTC (rev 6084)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/RegistrationInfoMapping.java 2011-03-17 20:42:23 UTC (rev 6085)
@@ -28,10 +28,10 @@
import org.chromattic.api.annotations.OneToMany;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
+import org.gatein.common.io.IOTools;
import org.gatein.wsrp.consumer.RegistrationInfo;
import org.gatein.wsrp.consumer.RegistrationProperty;
import org.gatein.wsrp.jcr.ChromatticPersister;
-import org.gatein.wsrp.jcr.mapping.Utils;
import org.gatein.wsrp.registration.RegistrationPropertyDescription;
import org.gatein.wsrp.registration.mapping.RegistrationPropertyDescriptionMapping;
@@ -99,7 +99,7 @@
{
initial.setConsumerName(getConsumerName());
initial.setRegistrationHandle(getRegistrationHandle());
- initial.setRegistrationState(Utils.safeGetBytes(getRegistrationState()));
+ initial.setRegistrationState(IOTools.safeGetBytes(getRegistrationState()));
// registration properties
for (RegistrationPropertyMapping rpm : getRegistrationProperties())
Deleted: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/jcr/mapping/Utils.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/jcr/mapping/Utils.java 2011-03-17 20:24:57 UTC (rev 6084)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/jcr/mapping/Utils.java 2011-03-17 20:42:23 UTC (rev 6085)
@@ -1,62 +0,0 @@
-/*
- * JBoss, a division of Red Hat
- * Copyright 2011, Red Hat Middleware, LLC, and individual
- * contributors as indicated by the @authors tag. See the
- * copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.gatein.wsrp.jcr.mapping;
-
-import org.gatein.common.io.IOTools;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
- * @version $Revision$
- * @deprecated Remove when we can use common 2.0.4 GTNWSRP-90
- */
-public class Utils
-{
- public static byte[] safeGetBytes(InputStream is)
- {
- byte[] bytes;
-
- if (is == null)
- {
- return null;
- }
-
- try
- {
- bytes = IOTools.getBytes(is);
- return bytes;
- }
- catch (IOException ignore)
- {
- // todo: should log
- return null;
- }
- finally
- {
- IOTools.safeClose(is);
- }
- }
-}
Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/RegistrationMapping.java
===================================================================
--- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/RegistrationMapping.java 2011-03-17 20:24:57 UTC (rev 6084)
+++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/RegistrationMapping.java 2011-03-17 20:42:23 UTC (rev 6085)
@@ -31,6 +31,7 @@
import org.chromattic.api.annotations.Owner;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
+import org.gatein.common.io.IOTools;
import org.gatein.common.util.ParameterValidation;
import org.gatein.pc.api.PortletContext;
import org.gatein.pc.api.PortletStateType;
@@ -40,7 +41,6 @@
import org.gatein.registration.RegistrationStatus;
import org.gatein.registration.spi.ConsumerSPI;
import org.gatein.registration.spi.RegistrationSPI;
-import org.gatein.wsrp.jcr.mapping.Utils;
import org.gatein.wsrp.registration.JCRRegistrationPersistenceManager;
import javax.xml.namespace.QName;
@@ -148,7 +148,7 @@
Collection<PortletContextMapping> pcms = getPortletContexts();
for (PortletContextMapping pcm : pcms)
{
- PortletContext pc = PortletContext.createPortletContext(pcm.getId(), Utils.safeGetBytes(pcm.getState()));
+ PortletContext pc = PortletContext.createPortletContext(pcm.getId(), IOTools.safeGetBytes(pcm.getState()));
reg.addPortletContext(pc);
}
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2011-03-17 20:24:57 UTC (rev 6084)
+++ components/wsrp/trunk/pom.xml 2011-03-17 20:42:23 UTC (rev 6085)
@@ -48,7 +48,7 @@
<properties>
<version.gatein.pc>2.3.0-Beta01</version.gatein.pc>
- <version.gatein.common>2.0.4-Beta02-SNAPSHOT</version.gatein.common>
+ <version.gatein.common>2.0.4-Beta02</version.gatein.common>
<version.gatein.wci>2.1.0-Beta01</version.gatein.wci>
<version.jsf>1.2_12</version.jsf>
13 years, 9 months
gatein SVN: r6084 - in components/common/trunk: common and 2 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-03-17 16:24:57 -0400 (Thu, 17 Mar 2011)
New Revision: 6084
Modified:
components/common/trunk/common/pom.xml
components/common/trunk/logging/pom.xml
components/common/trunk/mc/pom.xml
components/common/trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/common/trunk/common/pom.xml
===================================================================
--- components/common/trunk/common/pom.xml 2011-03-17 20:24:46 UTC (rev 6083)
+++ components/common/trunk/common/pom.xml 2011-03-17 20:24:57 UTC (rev 6084)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.4-Beta02</version>
+ <version>2.0.4-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-common</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-logging</artifactId>
- <version>2.0.4-Beta02</version>
+ <version>2.0.4-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
Modified: components/common/trunk/logging/pom.xml
===================================================================
--- components/common/trunk/logging/pom.xml 2011-03-17 20:24:46 UTC (rev 6083)
+++ components/common/trunk/logging/pom.xml 2011-03-17 20:24:57 UTC (rev 6084)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.4-Beta02</version>
+ <version>2.0.4-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-logging</artifactId>
Modified: components/common/trunk/mc/pom.xml
===================================================================
--- components/common/trunk/mc/pom.xml 2011-03-17 20:24:46 UTC (rev 6083)
+++ components/common/trunk/mc/pom.xml 2011-03-17 20:24:57 UTC (rev 6084)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.4-Beta02</version>
+ <version>2.0.4-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-mc</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-logging</artifactId>
- <version>2.0.4-Beta02</version>
+ <version>2.0.4-Beta03-SNAPSHOT</version>
</dependency>
<dependency>
Modified: components/common/trunk/pom.xml
===================================================================
--- components/common/trunk/pom.xml 2011-03-17 20:24:46 UTC (rev 6083)
+++ components/common/trunk/pom.xml 2011-03-17 20:24:57 UTC (rev 6084)
@@ -6,7 +6,7 @@
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.4-Beta02</version>
+ <version>2.0.4-Beta03-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
@@ -16,9 +16,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/common/tags/2.0....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/common/tags/2.0.4-B...</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/common/tags/2.0.4-Beta02</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/common/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/common/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/common/trunk</url>
</scm>
<!-- Import dependency management configuration -->
13 years, 9 months
gatein SVN: r6083 - components/common/tags.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-03-17 16:24:46 -0400 (Thu, 17 Mar 2011)
New Revision: 6083
Added:
components/common/tags/2.0.4-Beta02/
Log:
[maven-scm] copy for tag 2.0.4-Beta02
13 years, 9 months
gatein SVN: r6082 - in components/common/trunk: common and 2 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-03-17 16:24:22 -0400 (Thu, 17 Mar 2011)
New Revision: 6082
Modified:
components/common/trunk/common/pom.xml
components/common/trunk/logging/pom.xml
components/common/trunk/mc/pom.xml
components/common/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 2.0.4-Beta02
Modified: components/common/trunk/common/pom.xml
===================================================================
--- components/common/trunk/common/pom.xml 2011-03-17 19:57:40 UTC (rev 6081)
+++ components/common/trunk/common/pom.xml 2011-03-17 20:24:22 UTC (rev 6082)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.4-Beta02-SNAPSHOT</version>
+ <version>2.0.4-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-common</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-logging</artifactId>
- <version>2.0.4-Beta02-SNAPSHOT</version>
+ <version>2.0.4-Beta02</version>
</dependency>
<dependency>
Modified: components/common/trunk/logging/pom.xml
===================================================================
--- components/common/trunk/logging/pom.xml 2011-03-17 19:57:40 UTC (rev 6081)
+++ components/common/trunk/logging/pom.xml 2011-03-17 20:24:22 UTC (rev 6082)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.4-Beta02-SNAPSHOT</version>
+ <version>2.0.4-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-logging</artifactId>
Modified: components/common/trunk/mc/pom.xml
===================================================================
--- components/common/trunk/mc/pom.xml 2011-03-17 19:57:40 UTC (rev 6081)
+++ components/common/trunk/mc/pom.xml 2011-03-17 20:24:22 UTC (rev 6082)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.4-Beta02-SNAPSHOT</version>
+ <version>2.0.4-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-mc</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-logging</artifactId>
- <version>2.0.4-Beta02-SNAPSHOT</version>
+ <version>2.0.4-Beta02</version>
</dependency>
<dependency>
Modified: components/common/trunk/pom.xml
===================================================================
--- components/common/trunk/pom.xml 2011-03-17 19:57:40 UTC (rev 6081)
+++ components/common/trunk/pom.xml 2011-03-17 20:24:22 UTC (rev 6082)
@@ -6,7 +6,7 @@
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.4-Beta02-SNAPSHOT</version>
+ <version>2.0.4-Beta02</version>
<packaging>pom</packaging>
<parent>
@@ -16,9 +16,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/common/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/common/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/common/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/common/tags/2.0....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/common/tags/2.0.4-B...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/common/tags/2.0.4-Beta02</url>
</scm>
<!-- Import dependency management configuration -->
13 years, 9 months
gatein SVN: r6081 - components/common/trunk/common/src/main/java/org/gatein/common/io.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-03-17 15:57:40 -0400 (Thu, 17 Mar 2011)
New Revision: 6081
Modified:
components/common/trunk/common/src/main/java/org/gatein/common/io/IOTools.java
Log:
- Added safeGetBytes method.
Modified: components/common/trunk/common/src/main/java/org/gatein/common/io/IOTools.java
===================================================================
--- components/common/trunk/common/src/main/java/org/gatein/common/io/IOTools.java 2011-03-17 17:23:27 UTC (rev 6080)
+++ components/common/trunk/common/src/main/java/org/gatein/common/io/IOTools.java 2011-03-17 19:57:40 UTC (rev 6081)
@@ -1,48 +1,48 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2009, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2011, Red Hat Middleware, LLC, and individual
+ * contributors as indicated by the @authors tag. See the
+ * copyright.txt in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.gatein.common.io;
import org.gatein.common.logging.Logger;
import org.gatein.common.logging.LoggerFactory;
import org.gatein.common.util.Tools;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.InvocationTargetException;
-import java.io.OutputStream;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectStreamClass;
+import java.io.OutputStream;
import java.io.Reader;
-import java.io.ByteArrayOutputStream;
+import java.io.Serializable;
import java.io.Writer;
-import java.io.Serializable;
-import java.io.ObjectOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ObjectInputStream;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.ObjectStreamClass;
-import java.io.Closeable;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
/**
* IO tools.
@@ -63,13 +63,11 @@
private static final Class<?>[] EMPTY_PARAMETER_TYPES = new Class[0];
/**
- * <p>Attempt to close an object. Null argument value is authorized and no operation will be performed in that
- * use case.</p>
+ * <p>Attempt to close an object. Null argument value is authorized and no operation will be performed in that use
+ * case.</p> <p/> <p>It will try to obtain a <code>close()</code> method by reflection and it will be invoked only if
+ * the method is public and not static. If the method is called, any <code>Error</code> or
+ * <code>RuntimeException</code> will be rethrown, any other kind of throwable will not be rethrown in any form.</p>
*
- * <p>It will try to obtain a <code>close()</code> method by reflection and it
- * will be invoked only if the method is public and not static. If the method is called, any <code>Error</code>
- * or <code>RuntimeException</code> will be rethrown, any other kind of throwable will not be rethrown in any form.</p>
- *
* @param closable the object to close
*/
public static void safeClose(Object closable)
@@ -122,8 +120,9 @@
}
/**
- * <p>Attempt to close an {@link Closeable} object. Null argument value is authorized and no operation will be performed in that
- * use case. {@link IOException} thrown are logged using the <code>error</code> level but not propagated.</p>
+ * <p>Attempt to close an {@link Closeable} object. Null argument value is authorized and no operation will be
+ * performed in that use case. {@link IOException} thrown are logged using the <code>error</code> level but not
+ * propagated.</p>
*
* @param out the stream to close
*/
@@ -143,11 +142,11 @@
}
/**
- * @see #getBytes(java.io.InputStream, int)
* @param in the input stream
* @return the bytes read from the stream
* @throws java.io.IOException
* @throws IllegalArgumentException if the input stream is null
+ * @see #getBytes(java.io.InputStream, int)
*/
public static byte[] getBytes(InputStream in) throws IOException, IllegalArgumentException
{
@@ -157,7 +156,7 @@
/**
* Get the bytes from the provided input stream. No attempt will be made to close the stream.
*
- * @param in the input stream
+ * @param in the input stream
* @param bufferSize the buffer size used to copy the bytes
* @return the bytes read from the stream
* @throws java.io.IOException
@@ -170,11 +169,36 @@
return out.toByteArray();
}
+ public static byte[] safeGetBytes(InputStream is)
+ {
+ byte[] bytes;
+
+ if (is == null)
+ {
+ return null;
+ }
+
+ try
+ {
+ bytes = getBytes(is);
+ return bytes;
+ }
+ catch (IOException ignore)
+ {
+ // todo: should log
+ return null;
+ }
+ finally
+ {
+ IOTools.safeClose(is);
+ }
+ }
+
/**
- * @see #copy(java.io.InputStream, java.io.OutputStream, int)
* @param in the incoming stream
* @param out the outcoming stream
* @throws IllegalArgumentException if an argument is null
+ * @see #copy(java.io.InputStream, java.io.OutputStream, int)
*/
public static void copy(InputStream in, OutputStream out) throws IOException
{
@@ -182,8 +206,8 @@
}
/**
- * Pipe an incoming stream in an outcoming stream until no bytes is available from the input stream.
- * No attempts will be made to close the streams.
+ * Pipe an incoming stream in an outcoming stream until no bytes is available from the input stream. No attempts will
+ * be made to close the streams.
*
* @param in the incoming stream
* @param out the outcoming stream
@@ -282,7 +306,7 @@
* @param serializable the serializable object to clone
* @return a clone
* @throws IllegalArgumentException if the serializable object is null
- * @throws IOException any IOException
+ * @throws IOException any IOException
*/
public static <S extends Serializable> S clone(S serializable) throws IllegalArgumentException, IOException
{
@@ -297,14 +321,14 @@
}
/**
- * Clone an object implementing the <code>Serializable</code> interface. The specified classloader will be used
- * to perform the unserialization. If no classloader is specified and the object is not null then the classloader
- * used is the one returned by <code>serializable.getClass().getClassLoader()</code>.
+ * Clone an object implementing the <code>Serializable</code> interface. The specified classloader will be used to
+ * perform the unserialization. If no classloader is specified and the object is not null then the classloader used
+ * is the one returned by <code>serializable.getClass().getClassLoader()</code>.
*
* @param serializable the serializable object to clone
* @return a clone
* @throws IllegalArgumentException if the serializable object is null
- * @throws IOException any IOException
+ * @throws IOException any IOException
*/
@SuppressWarnings("unchecked")
public static <S extends Serializable> S clone(S serializable, ClassLoader classLoader) throws IllegalArgumentException, IOException, ClassNotFoundException
@@ -343,8 +367,8 @@
* @param bytes the bytes to unserialize
* @return the unserialized object
* @throws IllegalArgumentException if the byte array is null
- * @throws IOException any IOException
- * @throws ClassNotFoundException any ClassNotFoundException
+ * @throws IOException any IOException
+ * @throws ClassNotFoundException any ClassNotFoundException
*/
public static Serializable unserialize(byte[] bytes) throws IllegalArgumentException, IOException, ClassNotFoundException
{
@@ -355,12 +379,12 @@
* Unserialize the bytes into an object. If the provided classloader is not null, this classloader is used to perform
* the unserialization otherwise the thread current context classloader is used.
*
- * @param bytes the bytes to unserialize
+ * @param bytes the bytes to unserialize
* @param classLoader the classloader
* @return the unserialized object
* @throws IllegalArgumentException if the byte array is null
- * @throws IOException any IOException
- * @throws ClassNotFoundException any ClassNotFoundException
+ * @throws IOException any IOException
+ * @throws ClassNotFoundException any ClassNotFoundException
*/
public static Serializable unserialize(byte[] bytes, final ClassLoader classLoader) throws IllegalArgumentException, IOException, ClassNotFoundException
{
@@ -382,7 +406,7 @@
else
{
String className = desc.getName();
-
+
// JDK 6, by default, only supports array types (ex. [[B) using Class.forName()
return Class.forName(className, false, classLoader);
}
@@ -402,7 +426,7 @@
{
ifaceClasses[i] = classLoader.loadClass(interfaces[i]);
}
-
+
return java.lang.reflect.Proxy.getProxyClass(classLoader, ifaceClasses);
}
}
@@ -464,9 +488,10 @@
}
/**
- * Check that the provided input stream is buffered. If the argument is already an instance of <code>BufferedInputStream</code>
- * no operation will be performed, otherwise a instance of <code>BufferedInputStream</code> will be created and returned.
- *
+ * Check that the provided input stream is buffered. If the argument is already an instance of
+ * <code>BufferedInputStream</code> no operation will be performed, otherwise a instance of
+ * <code>BufferedInputStream</code> will be created and returned.
+ * <p/>
* If the provided argument is null, the null value is returned.
*
* @param in the stream
@@ -492,9 +517,10 @@
}
/**
- * Check that the provided output stream is buffered. If the argument is already an instance of <code>BufferedOutputStream</code>
- * no operation will be performed, otherwise a instance of <code>BufferedOutputStream</code> will be created and returned.
- *
+ * Check that the provided output stream is buffered. If the argument is already an instance of
+ * <code>BufferedOutputStream</code> no operation will be performed, otherwise a instance of
+ * <code>BufferedOutputStream</code> will be created and returned.
+ * <p/>
* If the provided argument is null, the null value is returned.
*
* @param out the stream
13 years, 9 months
gatein SVN: r6080 - in components/wsrp/branches/2.0.x/producer/src: test/java/org/gatein/registration and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-03-17 13:23:27 -0400 (Thu, 17 Mar 2011)
New Revision: 6080
Added:
components/wsrp/branches/2.0.x/producer/src/test/java/org/gatein/registration/RegistrationUtilsTestCase.java
Modified:
components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/registration/RegistrationUtils.java
Log:
- GTNWSRP-211: fixed improper implementation of RegistrationUtils.validateConsumerAgent and added test case.
Modified: components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/registration/RegistrationUtils.java
===================================================================
--- components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/registration/RegistrationUtils.java 2011-03-17 17:22:19 UTC (rev 6079)
+++ components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/registration/RegistrationUtils.java 2011-03-17 17:23:27 UTC (rev 6080)
@@ -44,23 +44,37 @@
}
/**
+ * Per the specification (http://www.oasis-open.org/committees/download.php/18617/wsrp-2.0-spec-pr-...):
+ * The consumerAgent value MUST start with "productName.majorVersion.minorVersion" where "productName" identifies the
+ * product the Consumer installed for its deployment, and majorVersion and minorVersion are vendor-defined
+ * indications of the version of its product. This string can then contain any additional characters/words the
+ * product or Consumer wish to supply.
+ *
* @param consumerAgent
* @throws IllegalArgumentException
* @since 2.6
*/
- public static void validateConsumerAgent(String consumerAgent) throws IllegalArgumentException
+ public static void validateConsumerAgent(final String consumerAgent) throws IllegalArgumentException
{
ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(consumerAgent, "consumer agent", null);
char periodChar = '.';
- int period = consumerAgent.indexOf(periodChar);
+
+ String tmp = consumerAgent.trim();
+
+ int period = tmp.indexOf(periodChar);
if (period != -1)
{
- consumerAgent = consumerAgent.substring(period);
- period = consumerAgent.indexOf(periodChar);
+ tmp = tmp.substring(period + 1);
+ period = tmp.indexOf(periodChar);
if (period != -1)
{
- return;
+ tmp = tmp.substring(period + 1);
+
+ if (tmp.length() > 0)
+ {
+ return;
+ }
}
}
Added: components/wsrp/branches/2.0.x/producer/src/test/java/org/gatein/registration/RegistrationUtilsTestCase.java
===================================================================
--- components/wsrp/branches/2.0.x/producer/src/test/java/org/gatein/registration/RegistrationUtilsTestCase.java (rev 0)
+++ components/wsrp/branches/2.0.x/producer/src/test/java/org/gatein/registration/RegistrationUtilsTestCase.java 2011-03-17 17:23:27 UTC (rev 6080)
@@ -0,0 +1,74 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.gatein.registration;
+
+import junit.framework.TestCase;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+public class RegistrationUtilsTestCase extends TestCase
+{
+ public void testValidateConsumerAgentStrict()
+ {
+ RegistrationUtils.setStrict(true);
+
+ RegistrationUtils.validateConsumerAgent("foo.bar.baz");
+ RegistrationUtils.validateConsumerAgent("foo.bar.baz.");
+ RegistrationUtils.validateConsumerAgent("foo.bar.baz. ");
+ RegistrationUtils.validateConsumerAgent("foo.bar.baz. dasfsafads");
+
+ checkValidateProperlyRejects("goo");
+ checkValidateProperlyRejects("goo.");
+ checkValidateProperlyRejects("goo.boo");
+ checkValidateProperlyRejects("goo.boo.");
+ checkValidateProperlyRejects("goo.boo. ");
+ }
+
+ private void checkValidateProperlyRejects(String consumerAgent)
+ {
+ try
+ {
+ RegistrationUtils.validateConsumerAgent(consumerAgent);
+ fail("Should have rejected '" + consumerAgent + "' as an invalid Consumer Agent string");
+ }
+ catch (IllegalArgumentException e)
+ {
+ // expected
+ }
+ }
+
+ public void testValidateConsumerAgentLenient()
+ {
+ RegistrationUtils.setStrict(false);
+
+ RegistrationUtils.validateConsumerAgent("foo.bar.baz");
+
+ RegistrationUtils.validateConsumerAgent("goo");
+ RegistrationUtils.validateConsumerAgent("goo.");
+ RegistrationUtils.validateConsumerAgent("goo.boo");
+ RegistrationUtils.validateConsumerAgent("goo.boo.");
+ RegistrationUtils.validateConsumerAgent("goo.boo. ");
+ }
+}
13 years, 9 months
gatein SVN: r6079 - in components/wsrp/trunk/producer/src: test/java/org/gatein/registration and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-03-17 13:22:19 -0400 (Thu, 17 Mar 2011)
New Revision: 6079
Added:
components/wsrp/trunk/producer/src/test/java/org/gatein/registration/RegistrationUtilsTestCase.java
Modified:
components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationUtils.java
Log:
- GTNWSRP-211: fixed improper implementation of RegistrationUtils.validateConsumerAgent and added test case.
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationUtils.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationUtils.java 2011-03-17 15:49:58 UTC (rev 6078)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationUtils.java 2011-03-17 17:22:19 UTC (rev 6079)
@@ -44,23 +44,37 @@
}
/**
+ * Per the specification (http://www.oasis-open.org/committees/download.php/18617/wsrp-2.0-spec-pr-...):
+ * The consumerAgent value MUST start with "productName.majorVersion.minorVersion" where "productName" identifies the
+ * product the Consumer installed for its deployment, and majorVersion and minorVersion are vendor-defined
+ * indications of the version of its product. This string can then contain any additional characters/words the
+ * product or Consumer wish to supply.
+ *
* @param consumerAgent
* @throws IllegalArgumentException
* @since 2.6
*/
- public static void validateConsumerAgent(String consumerAgent) throws IllegalArgumentException
+ public static void validateConsumerAgent(final String consumerAgent) throws IllegalArgumentException
{
ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(consumerAgent, "consumer agent", null);
char periodChar = '.';
- int period = consumerAgent.indexOf(periodChar);
+
+ String tmp = consumerAgent.trim();
+
+ int period = tmp.indexOf(periodChar);
if (period != -1)
{
- consumerAgent = consumerAgent.substring(period);
- period = consumerAgent.indexOf(periodChar);
+ tmp = tmp.substring(period + 1);
+ period = tmp.indexOf(periodChar);
if (period != -1)
{
- return;
+ tmp = tmp.substring(period + 1);
+
+ if (tmp.length() > 0)
+ {
+ return;
+ }
}
}
Added: components/wsrp/trunk/producer/src/test/java/org/gatein/registration/RegistrationUtilsTestCase.java
===================================================================
--- components/wsrp/trunk/producer/src/test/java/org/gatein/registration/RegistrationUtilsTestCase.java (rev 0)
+++ components/wsrp/trunk/producer/src/test/java/org/gatein/registration/RegistrationUtilsTestCase.java 2011-03-17 17:22:19 UTC (rev 6079)
@@ -0,0 +1,74 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.gatein.registration;
+
+import junit.framework.TestCase;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+public class RegistrationUtilsTestCase extends TestCase
+{
+ public void testValidateConsumerAgentStrict()
+ {
+ RegistrationUtils.setStrict(true);
+
+ RegistrationUtils.validateConsumerAgent("foo.bar.baz");
+ RegistrationUtils.validateConsumerAgent("foo.bar.baz.");
+ RegistrationUtils.validateConsumerAgent("foo.bar.baz. ");
+ RegistrationUtils.validateConsumerAgent("foo.bar.baz. dasfsafads");
+
+ checkValidateProperlyRejects("goo");
+ checkValidateProperlyRejects("goo.");
+ checkValidateProperlyRejects("goo.boo");
+ checkValidateProperlyRejects("goo.boo.");
+ checkValidateProperlyRejects("goo.boo. ");
+ }
+
+ private void checkValidateProperlyRejects(String consumerAgent)
+ {
+ try
+ {
+ RegistrationUtils.validateConsumerAgent(consumerAgent);
+ fail("Should have rejected '" + consumerAgent + "' as an invalid Consumer Agent string");
+ }
+ catch (IllegalArgumentException e)
+ {
+ // expected
+ }
+ }
+
+ public void testValidateConsumerAgentLenient()
+ {
+ RegistrationUtils.setStrict(false);
+
+ RegistrationUtils.validateConsumerAgent("foo.bar.baz");
+
+ RegistrationUtils.validateConsumerAgent("goo");
+ RegistrationUtils.validateConsumerAgent("goo.");
+ RegistrationUtils.validateConsumerAgent("goo.boo");
+ RegistrationUtils.validateConsumerAgent("goo.boo.");
+ RegistrationUtils.validateConsumerAgent("goo.boo. ");
+ }
+}
13 years, 9 months
gatein SVN: r6078 - portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/deployers.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-03-17 11:49:58 -0400 (Thu, 17 Mar 2011)
New Revision: 6078
Added:
portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/deployers/ear-deployer-jboss-beans.xml
Log:
- Added ear-deployer-jboss-beans.xml to temporarily remove class isolation so that extensions can work until a fix for EXOJCR-1256 exists.
Added: portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/deployers/ear-deployer-jboss-beans.xml
===================================================================
--- portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/deployers/ear-deployer-jboss-beans.xml (rev 0)
+++ portal/trunk/packaging/jboss-as6/pkg/src/main/resources/jboss/server/default/deployers/ear-deployer-jboss-beans.xml 2011-03-17 15:49:58 UTC (rev 6078)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ EAR Deployers
+ $Id: ear-deployer-jboss-beans.xml 104395 2010-05-03 14:43:17Z alesj $
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="EARStructureDeployer" class="org.jboss.deployment.EARStructure">
+ <property name="comparatorClassName">org.jboss.system.deployers.LegacyDeploymentContextComparator</property>
+ <!-- uncomment to disable xml validation property name="useValidation">false</property -->
+ </bean>
+
+ <!-- application.xml parsing deployer -->
+ <bean name="AppParsingDeployer" class="org.jboss.deployment.AppParsingDeployer">
+ <property name="useValidation"><inject bean="EARStructureDeployer" property="useValidation"/></property>
+ <!-- in case xml validation is disabled, it's also better to turn off schema validation property name="useSchemaValidation">false</property -->
+ </bean>
+ <!-- Implicit ear contents identifying deployer for ears without
+ an application.xml
+ -->
+ <bean name="EARContentsDeployer" class="org.jboss.deployment.EARContentsDeployer">
+ <!-- Does the deployment have to end in .ear to process it -->
+ <property name="requiresEarSuffix">true</property>
+ </bean>
+ <!-- jboss-app.xml parsing deployer -->
+ <bean name="JBossAppParsingDeployer" class="org.jboss.deployment.JBossAppParsingDeployer">
+ <!-- A flag indicating if the ear components should have in VM call
+ optimization disabled.
+ -->
+ <property name="callByValue">false</property>
+
+ <!-- Specify an unauthenticated identity -->
+ <property name="unauthenticatedIdentity">anonymous</property>
+
+ <install bean="ManagedDeploymentCreator" method="addAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.ear.jboss.JBossAppMetaData</value>
+ </parameter>
+ <parameter>
+ <value>ear</value>
+ </parameter>
+ </install>
+ <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
+ <parameter>
+ <value>org.jboss.metadata.ear.jboss.JBossAppMetaData</value>
+ </parameter>
+ </uninstall>
+
+ </bean>
+ <bean name="EARClassLoaderDeployer" class="org.jboss.deployment.EarClassLoaderDeployer">
+ <!-- A flag indicating if ear deployments should have their own scoped
+ class loader to isolate their classes from other deployments.
+ -->
+ <property name="isolated">false</property>
+ </bean>
+
+ <!-- Enforce the EE module name requirements in EE 6 section EE.8.1 -->
+ <bean name="ModuleNameDeployer" class="org.jboss.deployment.ModuleNameDeployer">
+ <constructor>
+ <parameter>
+ <set elementClass="java.lang.Class">
+ <value>org.jboss.metadata.ejb.jboss.JBossMetaData</value>
+ <value>org.jboss.metadata.web.jboss.JBossWebMetaData</value>
+ <!--<value>org.jboss.resource.metadata.RARDeploymentMetaData</value>-->
+ <value>org.jboss.metadata.client.jboss.JBossClientMetaData</value>
+ </set>
+ </parameter>
+ </constructor>
+ </bean>
+</deployment>
13 years, 9 months
gatein SVN: r6077 - portal/trunk/wsrp-integration/extension-component.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-03-17 11:32:12 -0400 (Thu, 17 Mar 2011)
New Revision: 6077
Modified:
portal/trunk/wsrp-integration/extension-component/pom.xml
Log:
- Added missing dependency.
Modified: portal/trunk/wsrp-integration/extension-component/pom.xml
===================================================================
--- portal/trunk/wsrp-integration/extension-component/pom.xml 2011-03-17 13:51:13 UTC (rev 6076)
+++ portal/trunk/wsrp-integration/extension-component/pom.xml 2011-03-17 15:32:12 UTC (rev 6077)
@@ -69,6 +69,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.gatein.wsrp</groupId>
+ <artifactId>wsrp-wss</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-api</artifactId>
<scope>provided</scope>
13 years, 9 months
gatein SVN: r6076 - portal/trunk.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-03-17 09:51:13 -0400 (Thu, 17 Mar 2011)
New Revision: 6076
Modified:
portal/trunk/pom.xml
Log:
- Reverted use of SNAPSHOT. Sorry.
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2011-03-17 12:54:53 UTC (rev 6075)
+++ portal/trunk/pom.xml 2011-03-17 13:51:13 UTC (rev 6076)
@@ -44,11 +44,11 @@
<org.jibx.version>1.2.1</org.jibx.version>
<org.shindig.version>1.0-r790473-Patch05</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
- <org.gatein.common.version>2.0.4-Beta02-SNAPSHOT</org.gatein.common.version>
+ <org.gatein.common.version>2.0.4-Beta01</org.gatein.common.version>
<org.gatein.wci.version>2.1.0-Beta01</org.gatein.wci.version>
<org.gatein.pc.version>2.3.0-Alpha01</org.gatein.pc.version>
<org.picketlink.idm>1.1.8.CR01</org.picketlink.idm>
- <org.gatein.wsrp.version>2.1.0-Alpha02-SNAPSHOT</org.gatein.wsrp.version>
+ <org.gatein.wsrp.version>2.1.0-Alpha01</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.5-GA</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<rhino.version>1.6R5</rhino.version>
13 years, 9 months