[jboss-svn-commits] JBL Code SVN: r8894 - in labs/jbosslabs/trunk/portal-extensions-2.6: forge-common and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jan 17 19:09:58 EST 2007
Author: adamw
Date: 2007-01-17 19:09:58 -0500 (Wed, 17 Jan 2007)
New Revision: 8894
Removed:
labs/jbosslabs/trunk/portal-extensions-2.6/jboss-as-binaries/
labs/jbosslabs/trunk/portal-extensions-2.6/portal-binaries/
Modified:
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/project.xml
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/soa/LabsServices.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-file-access/src/java/org/jboss/forge/fileaccess/portlet/DownloadCounterPortlet.java
labs/jbosslabs/trunk/portal-extensions-2.6/maven.xml
Log:
Moving binaries to their proper place
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/project.xml 2007-01-18 00:08:09 UTC (rev 8893)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/project.xml 2007-01-18 00:09:58 UTC (rev 8894)
@@ -18,14 +18,14 @@
<dependencies>
<dependency>
- <groupId>aslibs</groupId>
+ <groupId>jboss</groupId>
<artifactId>javax.servlet</artifactId>
<version>1.0</version>
<jar>javax.servlet.jar</jar>
</dependency>
<dependency>
- <groupId>aslibs</groupId>
+ <groupId>jboss</groupId>
<artifactId>javax.servlet.jsp</artifactId>
<version>1.0</version>
<jar>javax.servlet.jsp.jar</jar>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/soa/LabsServices.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/soa/LabsServices.java 2007-01-18 00:08:09 UTC (rev 8893)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/soa/LabsServices.java 2007-01-18 00:09:58 UTC (rev 8894)
@@ -1,24 +1,24 @@
- /*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., 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, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., 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.forge.common.soa;
@@ -39,22 +39,21 @@
public class LabsServices {
- private static final String PROP_SERVICE = "PropertyServiceBean/local";
+ private static final String PROP_SERVICE = "PropertyServiceBean/local";
- public static PrimatesService getPrimatesService()
- throws MalformedObjectNameException {
+ public static PrimatesService getPrimatesService()
+ throws MalformedObjectNameException {
- return (PrimatesService) MBeanProxyExt.create(PrimatesService.class,
- PrimatesService.PRIMATES_SERVICE, MBeanServerLocator.locate());
- }
-
- public static PropertyService getPropertyService() throws NamingException {
- return (PropertyService)(new InitialContext()).lookup(PROP_SERVICE);
- }
-
- public static ProjectsService getProjectsService() throws MalformedObjectNameException {
- return (ProjectsService) MBeanProxyExt.create(ProjectsService.class,
- ProjectsService.PROJECTS_SERVICE, MBeanServerLocator.locate());
- }
-
+ return (PrimatesService) MBeanProxyExt.create(PrimatesService.class,
+ PrimatesService.PRIMATES_SERVICE, MBeanServerLocator.locate());
+ }
+
+ public static PropertyService getPropertyService() throws NamingException {
+ return (PropertyService)(new InitialContext()).lookup(PROP_SERVICE);
+ }
+
+ public static ProjectsService getProjectsService() throws MalformedObjectNameException {
+ return (ProjectsService) MBeanProxyExt.create(ProjectsService.class,
+ ProjectsService.PROJECTS_SERVICE, MBeanServerLocator.locate());
+ }
}
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-file-access/src/java/org/jboss/forge/fileaccess/portlet/DownloadCounterPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-file-access/src/java/org/jboss/forge/fileaccess/portlet/DownloadCounterPortlet.java 2007-01-18 00:08:09 UTC (rev 8893)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-file-access/src/java/org/jboss/forge/fileaccess/portlet/DownloadCounterPortlet.java 2007-01-18 00:09:58 UTC (rev 8894)
@@ -47,14 +47,8 @@
*/
public class DownloadCounterPortlet extends JBossPortlet {
-
- @Inject
- private ContentManager contentManager;
-
-
public void doView(JBossRenderRequest request, JBossRenderResponse response)
- throws IOException, PortletException {
-
+ throws IOException, PortletException {
// Getting name of the project on which the download counter is used.
String projectId = ProjectsHelper.getSelectedProjectId(request);
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/maven.xml 2007-01-18 00:08:09 UTC (rev 8893)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/maven.xml 2007-01-18 00:09:58 UTC (rev 8894)
@@ -108,18 +108,6 @@
todir="${forge.sar.dir}/target/${forge.sar.name}"
file="${maven.repo.local}/jdom/jars/jdom-1.0.jar"
overwrite="true" />
- <ant:copy
- todir="${forge.sar.dir}/target/${forge.sar.name}"
- file="${maven.repo.local}/kosmos/jars/kosmos-server.jar"
- overwrite="true" />
- <ant:copy
- todir="${forge.sar.dir}/target/${forge.sar.name}"
- file="${maven.repo.local}/hessian/jars/hessian-3.0.13.jar"
- overwrite="true" />
- <ant:copy
- todir="${forge.sar.dir}/target/${forge.sar.name}"
- file="${maven.repo.local}/commons-collections/jars/commons-collections-3.1.jar"
- overwrite="true" />
<!-- Copying JAXB jars to the lib directory -->
<ant:copy
@@ -194,13 +182,11 @@
Before installing, building and deploying JBoss Labs please create and/ or modify the following files:
(for all that are not created there's a template .sample file)
1. build.properties
-2. configuration/to-copy/server/all/deploy/portal-login-ds.xml
-3. configuration/to-copy/server/all/deploy/JBLabs-ds.xml
+2. all files matching *-sample.* in the configuration/to-copy directory
4. jbosswiki/wiki-common/src/etc/org/jboss/wiki/filedatasource.properties
5. shotoku/shotoku-base/src/etc/shotoku.properties
6. shotoku/build.properties
-
Available goals:
- help - prints this info
- install - install JBoss AS, EJB3, Portal into a directory specified in build.properties.
@@ -217,7 +203,7 @@
<goal name="install">
<echo>
-Installing JBoss AS 4.0.4, EJB3 RC8, Portal 2.4 to the specified directory (${local.deploy.dir}).
+Installing JBoss AS 4.0.5, EJB3 RC9, Portal 2.6 to the specified directory (${local.deploy.dir}).
</echo>
<attainGoal name="prepare-repo" />
More information about the jboss-svn-commits
mailing list