[jboss-svn-commits] JBL Code SVN: r8864 - in labs/jbosslabs/trunk/portal-extensions-2.6: configuration/to-copy-install/bin and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jan 16 09:05:43 EST 2007
Author: adamw
Date: 2007-01-16 09:05:30 -0500 (Tue, 16 Jan 2007)
New Revision: 8864
Added:
labs/jbosslabs/trunk/portal-extensions-2.6/portal-default/src/web/WEB-INF/tld/
labs/jbosslabs/trunk/portal-extensions-2.6/portal-default/src/web/WEB-INF/tld/forge.tld
Removed:
labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy-install/bin/pluggable-instrumentor.jar
Modified:
labs/jbosslabs/trunk/portal-extensions-2.6/configuration/maven.xml
labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy-install/bin/run.conf
labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java
labs/jbosslabs/trunk/portal-extensions-2.6/jboss-as-binaries/to-copy/server/default/deploy/uuid-key-generator.sar
labs/jbosslabs/trunk/portal-extensions-2.6/polls/maven.xml
labs/jbosslabs/trunk/portal-extensions-2.6/polls/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:02:53 UTC (rev 8863)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/configuration/maven.xml 2007-01-16 14:05:30 UTC (rev 8864)
@@ -29,6 +29,7 @@
</ant:copy>
<ant:delete file="${local.deploy.dir}/jboss-portal.sar/conf/data/default-object.xml" />
<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" />
</goal>
</project>
Deleted: labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy-install/bin/pluggable-instrumentor.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy-install/bin/run.conf
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy-install/bin/run.conf 2007-01-16 14:02:53 UTC (rev 8863)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/configuration/to-copy-install/bin/run.conf 2007-01-16 14:05:30 UTC (rev 8864)
@@ -4,7 +4,7 @@
## ##
##############################################################################
-### $Id: run.conf,v 1.6.4.5 2006/05/12 10:40:36 dimitris Exp $
+### $Id: run.conf 55224 2006-08-04 17:36:47Z dimitris at jboss.org $
#
# This file is optional; it may be removed if not needed.
@@ -40,7 +40,7 @@
# Specify options to pass to the Java VM.
#
if [ "x$JAVA_OPTS" = "x" ]; then
- JAVA_OPTS="-server -Xms512m -Xmx512m -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000"
+ JAVA_OPTS="-Xms512m -Xmx512m -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000"
fi
# Sample JPDA settings for remote socket debuging
@@ -49,4 +49,3 @@
# Sample JPDA settings for shared memory debugging
#JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=n,address=jboss"
-JAVA_OPTS="$JAVA_OPTS -javaagent:pluggable-instrumentor.jar"
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java 2007-01-16 14:02:53 UTC (rev 8863)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java 2007-01-16 14:05:30 UTC (rev 8864)
@@ -151,7 +151,7 @@
fillContext(new NullPermissionsChecker());
fillLevels();
} catch (Exception e) {
- log.warn("Projects descriptor constructor: " + e);
+ log.error("Projects descriptor constructor: " + e);
}
}
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/jboss-as-binaries/to-copy/server/default/deploy/uuid-key-generator.sar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/polls/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/polls/maven.xml 2007-01-16 14:02:53 UTC (rev 8863)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/polls/maven.xml 2007-01-16 14:05:30 UTC (rev 8864)
@@ -30,9 +30,10 @@
<goal name="deploy">
<!--attainGoal name="prj-war-deploy" /-->
- <ant:copy tofile="${local.deploy.dir}/polls-commons.jar" file="target/polls-portlet.jar" />
- <ant:copy tofile="${local.deploy.dir}/polls-portlet.war" file="target/polls-portlet.war" />
+ <!--<ant:copy tofile="${local.deploy.dir}/polls-commons.jar" file="target/polls-portlet.jar" />
+ <ant:copy tofile="${local.deploy.dir}/polls-portlet.war" file="target/polls-portlet.war" />-->
<!--ant:copy tofile="${local.deploy.dir}/polls.ejb3" file="target/polls-portlet-1.0.ejb3" /-->
+ <attainGoal name="prj-war-deploy" />
</goal>
<goal name="clean">
Modified: labs/jbosslabs/trunk/portal-extensions-2.6/polls/project.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/polls/project.properties 2007-01-16 14:02:53 UTC (rev 8863)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/polls/project.properties 2007-01-16 14:05:30 UTC (rev 8864)
@@ -3,7 +3,7 @@
maven.war.src=${basedir}/src/web
#maven.ejb.includes=**/service/*.class, **/META-INF/persistence.xml
#maven.jar.excludes=**/PollsPortlet.class, **/service/*.class, **/META-INF/persistence.xml
-maven.jar.excludes=**/PollsPortlet.class
-maven.war.classes.includes=**/PollsPortlet.class
+#maven.jar.excludes=**/PollsPortlet.class
+#maven.war.classes.includes=**/PollsPortlet.class
maven.final.name=${pom.artifactId}
\ No newline at end of file
Added: labs/jbosslabs/trunk/portal-extensions-2.6/portal-default/src/web/WEB-INF/tld/forge.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-2.6/portal-default/src/web/WEB-INF/tld/forge.tld 2007-01-16 14:02:53 UTC (rev 8863)
+++ labs/jbosslabs/trunk/portal-extensions-2.6/portal-default/src/web/WEB-INF/tld/forge.tld 2007-01-16 14:05:30 UTC (rev 8864)
@@ -0,0 +1,174 @@
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee web-jsptaglibrary_2_0.xsd"
+ version="2.0">
+ <!--
+ JBoss, the OpenSource J2EE webOS
+ Distributable under LGPL license.
+ See terms of license at gnu.org.
+ -->
+ <tlib-version>1.1</tlib-version>
+ <jsp-version>2.0</jsp-version>
+ <shortname>forge</shortname>
+ <info>Forge tags</info>
+
+ <tag>
+ <name>pageURL</name>
+ <tagclass>org.jboss.forge.common.taglib.PageURLTag</tagclass>
+ <attribute>
+ <name>page</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>form</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </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>
+ <name>name</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>value</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <name>wikiURL</name>
+ <tagclass>org.jboss.forge.common.taglib.WikiURLTag</tagclass>
+ <attribute>
+ <name>page</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <name>freezoneURL</name>
+ <tagclass>org.jboss.forge.common.taglib.FreezoneURLTag</tagclass>
+ <attribute>
+ <name>page</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <name>projectURL</name>
+ <tagclass>org.jboss.forge.common.taglib.ProjectURLTag</tagclass>
+ <attribute>
+ <name>project</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>page</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>form</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <name>categoryURL</name>
+ <tagclass>org.jboss.forge.common.taglib.CategoryURLTag</tagclass>
+ <attribute>
+ <name>category</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>form</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <name>selectedProject</name>
+ <tagclass>org.jboss.forge.common.taglib.SelectedProjectTag</tagclass>
+ </tag>
+
+ <tag>
+ <name>imagePath</name>
+ <tagclass>org.jboss.forge.common.taglib.ImagePathTag</tagclass>
+ <attribute>
+ <name>src</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>project</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <name>attrValue</name>
+ <tagclass>org.jboss.forge.common.taglib.AttrValueTag</tagclass>
+ <attribute>
+ <name>name</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <name>attrIf</name>
+ <tagclass>org.jboss.forge.common.taglib.AttrIfTag</tagclass>
+ <attribute>
+ <name>name</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+</taglib>
More information about the jboss-svn-commits
mailing list