[jboss-svn-commits] JBL Code SVN: r18634 - in labs/jbosslabs/trunk/portal-extensions: forge-blog and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Feb 29 07:02:56 EST 2008
Author: adamw
Date: 2008-02-29 07:02:56 -0500 (Fri, 29 Feb 2008)
New Revision: 18634
Removed:
labs/jbosslabs/trunk/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/ProjectVariableResolver.java
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-blog/forge-blog.iml
labs/jbosslabs/trunk/portal-extensions/forge-blog/maven.xml
labs/jbosslabs/trunk/portal-extensions/forge-blog/project.xml
labs/jbosslabs/trunk/portal-extensions/forge-feeds/project.xml
labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml
labs/jbosslabs/trunk/portal-extensions/project.properties
Log:
Modified: labs/jbosslabs/trunk/portal-extensions/forge-blog/forge-blog.iml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-blog/forge-blog.iml 2008-02-29 11:31:59 UTC (rev 18633)
+++ labs/jbosslabs/trunk/portal-extensions/forge-blog/forge-blog.iml 2008-02-29 12:02:56 UTC (rev 18634)
@@ -9,6 +9,9 @@
<webroots>
<root url="file://$MODULE_DIR$/binaries/jboss-blog.sar/jboss-blog.war" relative="/" />
</webroots>
+ <sourceRoots>
+ <root url="file://$MODULE_DIR$/src/java" />
+ </sourceRoots>
<building>
<setting name="EXPLODED_URL" value="file://" />
<setting name="EXPLODED_ENABLED" value="false" />
Modified: labs/jbosslabs/trunk/portal-extensions/forge-blog/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-blog/maven.xml 2008-02-29 11:31:59 UTC (rev 18633)
+++ labs/jbosslabs/trunk/portal-extensions/forge-blog/maven.xml 2008-02-29 12:02:56 UTC (rev 18634)
@@ -7,32 +7,32 @@
<!-- Default war-project goals -->
<goal name="all">
- <attainGoal name="prj-all" />
+ <!--<attainGoal name="prj-all" />-->
</goal>
<goal name="build">
- <attainGoal name="java:compile" />
+<!-- <attainGoal name="java:compile" />
<ant:copy todir="target/classes">
<ant:fileset dir="src/java">
<ant:include name="**/*.xml" />
</ant:fileset>
</ant:copy>
<j:set var="maven.jar.includes" value="**/*.class,**/*.xml" />
- <attainGoal name="jar" />
+ <attainGoal name="jar" />-->
</goal>
<goal name="deploy">
- <ant:copy todir="${local.deploy.dir}">
+<!-- <ant:copy todir="${local.deploy.dir}">
<ant:fileset dir="binaries">
<ant:include name="**/*" />
</ant:fileset>
</ant:copy>
<ant:copy todir="${local.deploy.dir}/jboss-blog.sar/lib"
- file="target/forge-blog.jar" />
+ file="target/forge-blog.jar" />-->
</goal>
<goal name="clean">
- <ant:delete dir="${local.deploy.dir}/jboss-blog.sar" />
- <attainGoal name="prj-clean" />
+<!-- <ant:delete dir="${local.deploy.dir}/jboss-blog.sar" />
+ <attainGoal name="prj-clean" />-->
</goal>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-blog/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-blog/project.xml 2008-02-29 11:31:59 UTC (rev 18633)
+++ labs/jbosslabs/trunk/portal-extensions/forge-blog/project.xml 2008-02-29 12:02:56 UTC (rev 18634)
@@ -17,7 +17,7 @@
<description></description>
<dependencies>
- <dependency>
+<!-- <dependency>
<id>rome</id>
<version>0.9</version>
</dependency>
@@ -77,6 +77,6 @@
<artifactId>jsf-facelets</artifactId>
<version>1.0</version>
<jar>jsf-facelets.jar</jar>
- </dependency>
+ </dependency>-->
</dependencies>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-feeds/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-feeds/project.xml 2008-02-29 11:31:59 UTC (rev 18633)
+++ labs/jbosslabs/trunk/portal-extensions/forge-feeds/project.xml 2008-02-29 12:02:56 UTC (rev 18634)
@@ -23,12 +23,12 @@
<version>1.0</version>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>shotoku</groupId>
<artifactId>shotoku-feeds</artifactId>
<version>1.0</version>
<jar>shotoku-feeds.jar</jar>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>shotoku-cache</groupId>
Deleted: labs/jbosslabs/trunk/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/ProjectVariableResolver.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/ProjectVariableResolver.java 2008-02-29 11:31:59 UTC (rev 18633)
+++ labs/jbosslabs/trunk/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/ProjectVariableResolver.java 2008-02-29 12:02:56 UTC (rev 18634)
@@ -1,65 +0,0 @@
-package org.jboss.forge.feeds;
-
-import org.w3c.dom.Node;
-import org.jboss.shotoku.tools.Tools;
-import org.jboss.shotoku.feeds.variables.VariableResolver;
-import org.jboss.shotoku.feeds.variables.Substitution;
-import org.jboss.forge.common.projects.ProjectsHelper;
-import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
-
-import java.util.Set;
-import java.util.HashSet;
-
-/**
- * @author Adam Warski (adamw at aster.pl)
- */
-public class ProjectVariableResolver implements VariableResolver {
- public static final String PROJECTS_ID = "default";
- public static final String PROJECT_VARIABLE = "${project}";
- public static final String PROJECT_NAME_VARIABLE = "${project-name}";
-
- private String[] projects;
-
- public ProjectVariableResolver(Node n) {
- String projectLevelAttr = Tools.getAttributeValue(n, "project-level");
-
- if (projectLevelAttr == null) {
- projects = new String[0];
- return;
- }
-
- Set<String> projectIds = new HashSet<String>();
-
- if ("*".equals(projectLevelAttr)) {
- projectIds = ProjectsHelper.getProjects().getProjectIds(
- new NullPermissionsChecker());
- } else {
- System.out.println("LEVELS UNSUPPORTED!");
- }
-
- projects = projectIds.toArray(new String[0]);
- }
-
- public void expandSubstitutionsSet(Set<String> variables, Set<Substitution> substitutions) {
- if (!variables.remove(org.jboss.forge.feeds.ProjectVariableResolver.PROJECT_VARIABLE)) {
- return;
- }
-
- variables.remove(org.jboss.forge.feeds.ProjectVariableResolver.PROJECT_NAME_VARIABLE);
-
- Set<Substitution> newSubs = new HashSet<Substitution>();
-
- for (Substitution s : substitutions) {
- for (String projectId : projects) {
- Substitution newSub = s.clone();
- newSub.add(org.jboss.forge.feeds.ProjectVariableResolver.PROJECT_VARIABLE, projectId);
- newSub.add(org.jboss.forge.feeds.ProjectVariableResolver.PROJECT_NAME_VARIABLE, ProjectsHelper.getProjects().
- getProjectName(projectId));
- newSubs.add(newSub);
- }
- }
-
- substitutions.clear();
- substitutions.addAll(newSubs);
- }
-}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml 2008-02-29 11:31:59 UTC (rev 18633)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/maven.xml 2008-02-29 12:02:56 UTC (rev 18634)
@@ -7,7 +7,7 @@
<!-- Default war-project goals -->
<goal name="all">
- <attainGoal name="prj-all" />
+ <!--<attainGoal name="prj-all" />-->
</goal>
<goal name="buildGWT">
@@ -22,7 +22,7 @@
<ant:arg value="org.jboss.labs.tagme.gwt.TagMe" />
</ant:java>-->
- <ant:exec executable="java" >
+ <!--<ant:exec executable="java" >
<ant:arg value="-cp" />
<ant:arg value="src/java:../binaries/maven-repo-addons/google/jars/gwt-user.jar:../binaries/maven-repo-addons/google/jars/gwt-dev-linux.jar" />
<ant:arg value="com.google.gwt.dev.GWTCompiler" />
@@ -31,20 +31,20 @@
<ant:arg value="org.jboss.labs.tagme.gwt.TagMe" />
</ant:exec>
- <ant:copy file="../binaries/maven-repo-addons/google/jars/gwt-user.jar" toFile="target/gwt-user.jar" />
+ <ant:copy file="../binaries/maven-repo-addons/google/jars/gwt-user.jar" toFile="target/gwt-user.jar" />-->
</goal>
<goal name="build">
- <attainGoal name="buildGWT" />
+ <!--<attainGoal name="buildGWT" />
- <attainGoal name="prj-war-build" />
+ <attainGoal name="prj-war-build" />-->
</goal>
<goal name="deploy">
- <attainGoal name="prj-war-deploy" />
+<!-- <attainGoal name="prj-war-deploy" />-->
</goal>
<goal name="clean">
- <attainGoal name="prj-clean" />
+<!-- <attainGoal name="prj-clean" />-->
</goal>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions/project.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/project.properties 2008-02-29 11:31:59 UTC (rev 18633)
+++ labs/jbosslabs/trunk/portal-extensions/project.properties 2008-02-29 12:02:56 UTC (rev 18634)
@@ -19,7 +19,6 @@
maven.jar.override=on
maven.jar.shotoku-base=${ext.root.dir}/shotoku/shotoku-base/target/shotoku-base.jar
-maven.jar.shotoku-feeds=${ext.root.dir}/shotoku/shotoku-feeds/target/shotoku-feeds.jar
maven.jar.shotoku-file-access=${ext.root.dir}/shotoku/shotoku-file-access/target/shotoku-file-access.jar
maven.jar.shotoku-aop=${ext.root.dir}/shotoku/shotoku-aop/target/shotoku-aop.jar
maven.jar.shotoku-tags=${ext.root.dir}/shotoku/shotoku-tags/target/shotoku-tags.jar
More information about the jboss-svn-commits
mailing list