Author: thomas.heute(a)jboss.com Date: 2010-01-13 10:17:03 -0500 (Wed, 13 Jan 2010) New Revision: 1261 Removed: portal/trunk/component/scripting/src/test/java/org/exoplatform/commons/utils/ Modified: portal/trunk/.classpath portal/trunk/.project portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateStatistic.java portal/trunk/pom.xml portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationStatistic.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStatistic.java Log: - Updated common and pc - Removed classes that are already part of common Modified: portal/trunk/.classpath =================================================================== --- portal/trunk/.classpath 2010-01-13 15:07:53 UTC (rev 1260) +++ portal/trunk/.classpath 2010-01-13 15:17:03 UTC (rev 1261) @@ -38,12 +38,7 @@ <classpathentry kind="src" output="portlet/web/target/classes" path="portlet/web/src/main/java"/> <classpathentry excluding="**" kind="src" output="server/tomcat/patch/target/classes" path="server/tomcat/patch/src/main/tomcat"/> <classpathentry kind="src" output="server/tomcat/plugin/target/classes" path="server/tomcat/plugin/src/main/java"/> - <classpathentry excluding="**" kind="src" output="server/jboss/patch/target/classes" path="server/jboss/patch/src/main/jboss"/> <classpathentry kind="src" output="server/jboss/plugin/target/classes" path="server/jboss/plugin/src/main/java"/> - <classpathentry kind="src" output="sample/extension/config/target/classes" path="sample/extension/config/src/main/java"/> - <classpathentry kind="src" output="sample/extension/jar/target/classes" path="sample/extension/jar/src/main/java"/> - <classpathentry kind="src" output="sample/portal/config/target/classes" path="sample/portal/config/src/main/java"/> - <classpathentry kind="src" output="sample/portal/jar/target/classes" path="sample/portal/jar/src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> Modified: portal/trunk/.project =================================================================== --- portal/trunk/.project 2010-01-13 15:07:53 UTC (rev 1260) +++ portal/trunk/.project 2010-01-13 15:17:03 UTC (rev 1261) @@ -1,11 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>portal</name> + <name>trunk</name> <comment></comment> <projects> </projects> <buildSpec> <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> <name>org.eclipse.jdt.core.javabuilder</name> <arguments> </arguments> @@ -19,5 +24,6 @@ <natures> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.maven.ide.eclipse.maven2Nature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> </natures> </projectDescription> Modified: portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateStatistic.java =================================================================== --- portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateStatistic.java 2010-01-13 15:07:53 UTC (rev 1260) +++ portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateStatistic.java 2010-01-13 15:17:03 UTC (rev 1261) @@ -19,8 +19,8 @@ package org.exoplatform.groovyscript.text; -import org.exoplatform.commons.utils.AtomicPositiveLong; -import org.exoplatform.commons.utils.LongSampler; +import org.gatein.common.concurrent.AtomicPositiveLong; +import org.gatein.common.concurrent.LongSampler; import org.exoplatform.resolver.ResourceResolver; /** Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2010-01-13 15:07:53 UTC (rev 1260) +++ portal/trunk/pom.xml 2010-01-13 15:17:03 UTC (rev 1261) @@ -44,9 +44,9 @@ <org.exoplatform.jcr.version>1.12.0-Beta05</org.exoplatform.jcr.version> <org.jibx.version>1.2.1</org.jibx.version> <org.shindig.version>SNAPSHOT-r790473</org.shindig.version> - <org.gatein.common.version>2.0.0-CR02</org.gatein.common.version> + <org.gatein.common.version>2.0.0-CR03</org.gatein.common.version> <org.gatein.wci.version>2.0.0-CR02</org.gatein.wci.version> - <org.gatein.pc.version>2.1.0-CR01</org.gatein.pc.version> + <org.gatein.pc.version>2.1.0-CR02</org.gatein.pc.version> <org.picketlink.idm>1.1.0.Beta1</org.picketlink.idm> <org.gatein.wsrp.version>1.0.0-Beta04</org.gatein.wsrp.version> <org.gatein.mop.version>1.0.0-Beta13</org.gatein.mop.version> Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationStatistic.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationStatistic.java 2010-01-13 15:07:53 UTC (rev 1260) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationStatistic.java 2010-01-13 15:17:03 UTC (rev 1261) @@ -19,8 +19,8 @@ package org.exoplatform.portal.application; -import org.exoplatform.commons.utils.AtomicPositiveLong; -import org.exoplatform.commons.utils.LongSampler; +import org.gatein.common.concurrent.AtomicPositiveLong; +import org.gatein.common.concurrent.LongSampler; /** * Created by The eXo Platform SAS Author : tam.nguyen Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStatistic.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStatistic.java 2010-01-13 15:07:53 UTC (rev 1260) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStatistic.java 2010-01-13 15:17:03 UTC (rev 1261) @@ -19,8 +19,8 @@ package org.exoplatform.portal.application; -import org.exoplatform.commons.utils.AtomicPositiveLong; -import org.exoplatform.commons.utils.LongSampler; +import org.gatein.common.concurrent.AtomicPositiveLong; +import org.gatein.common.concurrent.LongSampler; public class PortalStatistic {