[jboss-svn-commits] JBL Code SVN: r8867 - in labs/jbosslabs/trunk/portal-extensions-2.6: configuration and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jan 16 10:25:11 EST 2007
Author: adamw
Date: 2007-01-16 10:24:59 -0500 (Tue, 16 Jan 2007)
New Revision: 8867
Added:
labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy/server/default/
Removed:
labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy/server/all/
labs/jbosslabs/trunk/portal-extensions-2.6/jboss-as-binaries/to-copy/server/all/
labs/jbosslabs/trunk/portal-extensions-2.6/jboss-as-binaries/to-copy/server/minimal/
Modified:
labs/jbosslabs/trunk/portal-extensions-2.6/configuration/maven.xml
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/portlet/ContentPortlet.java
labs/jbosslabs/trunk/portal-extensions-2.6/forge-file-access/maven.xml
labs/jbosslabs/trunk/portal-extensions-2.6/forge-speller/maven.xml
labs/jbosslabs/trunk/portal-extensions-2.6/forge-speller/project.properties
labs/jbosslabs/trunk/portal-extensions-2.6/forge-speller/src/web/WEB-INF/tld/forge.tld
labs/jbosslabs/trunk/portal-extensions-2.6/maven.xml
labs/jbosslabs/trunk/portal-extensions-2.6/primates/project.properties
Log:
http://jira.jboss.com/jira/browse/JBLAB-817
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/configuration/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/configuration/maven.xml 2007-01-16 14:36:35 UTC (rev 8866)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/configuration/maven.xml 2007-01-16 15:24:59 UTC (rev 8867)
@@ -31,5 +31,8 @@
<ant:delete dir="${local.deploy.dir}/jboss-portal.sar/portal-samples.war" />
<ant:delete dir="${local.deploy.dir}/jboss-portal.sar/portal-wsrp.war" />
<ant:delete dir="${local.deploy.dir}/jbossweb-tomcat55.sar/ROOT.war" />
+
+ <ant:delete dir="${local.deploy.dir}/hibernate-deployer.sar" />
+ <ant:delete dir="${local.deploy.dir}/jboss-ws4ee.war" />
</goal>
</project>
Copied: labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy/server/default (from rev 8864, labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy/server/all)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/portlet/ContentPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/portlet/ContentPortlet.java 2007-01-16 14:36:35 UTC (rev 8866)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/portlet/ContentPortlet.java 2007-01-16 15:24:59 UTC (rev 8867)
@@ -53,6 +53,15 @@
protected ContentManager cm;
+ // TODO
+ private synchronized ContentManager getCm() {
+ if (cm == null) {
+ cm = ForgeHelper.getContentManager(getContentManagerSuffix());
+ }
+
+ return cm;
+ }
+
/**
* Gets the suffix to use in the content reader.
*
@@ -71,7 +80,6 @@
public ContentPortlet(String title, String id) {
this.title = title;
this.id = id;
- this.cm = ForgeHelper.getContentManager(getContentManagerSuffix());
}
public void init() {
@@ -178,7 +186,7 @@
* @throws ResourceDoesNotExist
*/
public String readFile(String filename) throws IOException, ResourceDoesNotExist {
- return cm.getNode(filename).getContent();
+ return getCm().getNode(filename).getContent();
}
/**
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-file-access/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-file-access/maven.xml 2007-01-16 14:36:35 UTC (rev 8866)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-file-access/maven.xml 2007-01-16 15:24:59 UTC (rev 8867)
@@ -16,13 +16,10 @@
<goal name="deploy">
<attainGoal name="prj-war-deploy" />
- <j:set var="jar.to.dir" value="${local.deploy.dir}/shotoku-file-access.war" />
- <attainGoal name="jar-to-dir" />
- <ant:copy todir="${local.deploy.dir}/shotoku-file-access.war/WEB-INF/lib"
- overwrite="true"
- file="target/file-access.jar" />
- <attainGoal name="dir-to-jar" />
- </goal>
+ <ant:copy tofile="${local.deploy.dir}/shotoku.sar/forge-file-access.jar"
+ overwrite="true"
+ file="target/file-access.jar" />
+ </goal>
<goal name="clean">
<attainGoal name="prj-clean" />
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-speller/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-speller/maven.xml 2007-01-16 14:36:35 UTC (rev 8866)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-speller/maven.xml 2007-01-16 15:24:59 UTC (rev 8867)
@@ -7,20 +7,15 @@
<!-- Default war-project goals -->
<goal name="all">
- <attainGoal name="build" />
- <attainGoal name="deploy" />
+ <attainGoal name="prj-all" />
</goal>
<goal name="build">
- <attainGoal name="war" />
+ <attainGoal name="prj-war-build" />
</goal>
<goal name="deploy">
- <ant:copy todir="${local.deploy.dir}" flatten="true">
- <ant:fileset dir=".">
- <ant:filename name="target/*.war" />
- </ant:fileset>
- </ant:copy>
+ <attainGoal name="prj-war-deploy" />
</goal>
<goal name="clean">
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-speller/project.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-speller/project.properties 2007-01-16 14:36:35 UTC (rev 8866)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-speller/project.properties 2007-01-16 15:24:59 UTC (rev 8867)
@@ -1,3 +1,5 @@
-maven.repo.remote=http://repo1.maven.org/maven
-maven.junit.fork=yes
-maven.war.src=${basedir}/src/web
+maven.repo.remote=http://repo1.maven.org/maven
+maven.junit.fork=yes
+maven.war.src=${basedir}/src/web
+
+maven.final.name=${pom.artifactId}
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-speller/src/web/WEB-INF/tld/forge.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-speller/src/web/WEB-INF/tld/forge.tld 2007-01-16 14:36:35 UTC (rev 8866)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-speller/src/web/WEB-INF/tld/forge.tld 2007-01-16 15:24:59 UTC (rev 8867)
@@ -28,6 +28,41 @@
</tag>
<tag>
+ <name>tagmeButton</name>
+ <tagclass>org.jboss.forge.common.taglib.TagMeTag</tagclass>
+ <attribute>
+ <name>div</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>service</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>user</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>path</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>id</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>website</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
<name>param</name>
<tagclass>org.jboss.forge.common.taglib.ParamTag</tagclass>
<attribute>
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/maven.xml 2007-01-16 14:36:35 UTC (rev 8866)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/maven.xml 2007-01-16 15:24:59 UTC (rev 8867)
@@ -120,6 +120,16 @@
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
+ todir="${local.deploy.dir}/../lib"
+ file="${maven.repo.local}/jaxb/jars/jaxb-impl.jar"
+ overwrite="true" />
+ <ant:copy
+ todir="${local.deploy.dir}/../lib"
+ file="${maven.repo.local}/jaxb/jars/jaxb-api.jar"
+ overwrite="true" />
<!-- Deploying the sar -->
<ant:copy todir="${local.deploy.dir}" overwrite="true">
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/primates/project.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/primates/project.properties 2007-01-16 14:36:35 UTC (rev 8866)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/primates/project.properties 2007-01-16 15:24:59 UTC (rev 8867)
@@ -2,7 +2,7 @@
maven.junit.fork=yes
maven.war.src=${basedir}/src/web
maven.ejb.includes=**/service/*.class
-maven.jar.excludes=**/PrimatesPortlet.class, **/service/*.class
-maven.war.classes.includes=**/PrimatesPortlet.class
+maven.jar.excludes=**/service/*.class
+maven.war.classes.excludes=**/*.class
maven.ear.src=${maven.build.dir}/ear
-maven.ear.resources=${maven.build.dir}/ear2
\ No newline at end of file
+maven.ear.resources=${maven.build.dir}/ear2
More information about the jboss-svn-commits
mailing list