Menu
▾
▴
jboss-svn-commits — JBoss SVN commit notifications
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(233) |
Sep
(199) |
Oct
(206) |
Nov
(185) |
Dec
(270) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(232) |
Feb
(426) |
Mar
(623) |
Apr
(592) |
May
(506) |
Jun
(389) |
Jul
(160) |
Aug
(3) |
Sep
(1) |
Oct
(1) |
Nov
(2) |
Dec
(5) |
| 2007 |
Jan
(1) |
Feb
(1) |
Mar
(2) |
Apr
(2) |
May
(4) |
Jun
(2) |
Jul
|
Aug
(3) |
Sep
(5) |
Oct
(9) |
Nov
(6) |
Dec
(6) |
| 2008 |
Jan
(3) |
Feb
|
Mar
(1) |
Apr
(3) |
May
(3) |
Jun
(5) |
Jul
(10) |
Aug
(2) |
Sep
(12) |
Oct
(10) |
Nov
(54) |
Dec
(49) |
| 2009 |
Jan
(19) |
Feb
(13) |
Mar
(20) |
Apr
(24) |
May
(44) |
Jun
(29) |
Jul
(32) |
Aug
(10) |
Sep
(7) |
Oct
(10) |
Nov
(4) |
Dec
(17) |
| 2010 |
Jan
(14) |
Feb
(5) |
Mar
(23) |
Apr
(50) |
May
(31) |
Jun
(9) |
Jul
(5) |
Aug
(4) |
Sep
(7) |
Oct
(5) |
Nov
(2) |
Dec
(3) |
| 2011 |
Jan
(12) |
Feb
(5) |
Mar
(5) |
Apr
(3) |
May
(4) |
Jun
(3) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2012 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(4) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2015 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <jbo...@li...> - 2005-12-13 17:04:22
|
Author: kev...@jb... Date: 2005-12-13 12:04:18 -0500 (Tue, 13 Dec 2005) New Revision: 1805 Modified: trunk/labs/jbosstm/README Log: Testing Modified: trunk/labs/jbosstm/README =================================================================== --- trunk/labs/jbosstm/README 2005-12-13 17:02:00 UTC (rev 1804) +++ trunk/labs/jbosstm/README 2005-12-13 17:04:18 UTC (rev 1805) @@ -1 +1 @@ -testing +testing again |
|
From: <jbo...@li...> - 2005-12-13 17:02:25
|
Author: kev...@jb... Date: 2005-12-13 12:02:00 -0500 (Tue, 13 Dec 2005) New Revision: 1804 Modified: trunk/labs/jbosstm/README Log: Testing Modified: trunk/labs/jbosstm/README =================================================================== --- trunk/labs/jbosstm/README 2005-12-13 16:51:34 UTC (rev 1803) +++ trunk/labs/jbosstm/README 2005-12-13 17:02:00 UTC (rev 1804) @@ -1 +1 @@ -Initial revision. -tomben +testing |
|
From: <jbo...@li...> - 2005-12-13 16:51:46
|
Author: kev...@jb... Date: 2005-12-13 11:51:34 -0500 (Tue, 13 Dec 2005) New Revision: 1803 Added: trunk/labs/jbosstm/README Log: testing Added: trunk/labs/jbosstm/README =================================================================== --- trunk/labs/jbosstm/README 2005-12-13 16:42:49 UTC (rev 1802) +++ trunk/labs/jbosstm/README 2005-12-13 16:51:34 UTC (rev 1803) @@ -0,0 +1 @@ +Initial revision. -tomben |
|
From: <jbo...@li...> - 2005-12-13 16:43:01
|
Author: wrzep Date: 2005-12-13 11:42:49 -0500 (Tue, 13 Dec 2005) New Revision: 1802 Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/KosmosStatusPlugin.java trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Plugin.java trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/ScorePlugin.java trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java Log: passing properites Node instead of properties Map to plugin (allows more flexible plugins configuration) http://jira.jboss.com/jira/browse/JBLAB-415 Pawel Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/KosmosStatusPlugin.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/KosmosStatusPlugin.java 2005-12-12 23:16:16 UTC (rev 1801) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/KosmosStatusPlugin.java 2005-12-13 16:42:49 UTC (rev 1802) @@ -22,6 +22,7 @@ package org.jboss.forge.status; +import org.jboss.forge.common.XmlTools; import org.jboss.forge.common.projects.Projects; import org.jboss.forge.status.plugins.InvalidPluginPropertiesException; import org.jboss.forge.status.plugins.StatusPlugin; @@ -32,6 +33,8 @@ import java.util.Iterator; import java.util.Map; +import org.w3c.dom.Node; + /** * @author Pawel Wrzeszcz */ @@ -53,9 +56,10 @@ projectsMaps = new HashMap<String,Map>(); } - public void init(String name, String id, Projects projects, Map<String,String> properties) throws InvalidPluginPropertiesException { - super.init(name, id, projects,properties); + public void init(String name, String id, Projects projects, Node propertiesNode) throws InvalidPluginPropertiesException { + super.init(name, id, projects,propertiesNode); + Map<String, String> properties = XmlTools.getMapFromNodeAttributes(propertiesNode); getProperties(properties); } Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2005-12-12 23:16:16 UTC (rev 1801) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2005-12-13 16:42:49 UTC (rev 1802) @@ -212,12 +212,7 @@ return null; } - // Get plugin properies node - Map<String,String> pluginSpecificPropertiesMap = null; Node pluginSpecificPropertiesNode = pluginProperties.get(PLUGIN_PROPERTIES_ELEMENT); - if (pluginSpecificPropertiesNode != null) { - pluginSpecificPropertiesMap = getChildNodesStringMap(pluginSpecificPropertiesNode); - } // Get plugin instance; Plugin plugin = null; @@ -225,9 +220,9 @@ plugin = (Plugin) pluginClass.newInstance(); if (pluginType == STATUS_PLUGIN_ELEMENT) { - ((StatusPlugin) plugin).init(pluginName, pluginId, projects, pluginSpecificPropertiesMap); + ((StatusPlugin) plugin).init(pluginName, pluginId, projects, pluginSpecificPropertiesNode); } else { /* score plugin */ - ((ScorePlugin) plugin).init(pluginName, pluginId, statusPlugins, pluginSpecificPropertiesMap); + ((ScorePlugin) plugin).init(pluginName, pluginId, statusPlugins, pluginSpecificPropertiesNode); } } catch (InvalidPluginPropertiesException e) { Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Plugin.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Plugin.java 2005-12-12 23:16:16 UTC (rev 1801) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Plugin.java 2005-12-13 16:42:49 UTC (rev 1802) @@ -22,7 +22,7 @@ package org.jboss.forge.status.plugins; -import java.util.Map; +import org.w3c.dom.Node; /** * @author Pawel Wrzeszcz @@ -30,13 +30,13 @@ public abstract class Plugin { - protected Map properties; + protected Node propertiesNode; protected String name; protected String id; - public void init(String name, String id, Map<String,String> properties) throws InvalidPluginPropertiesException { - this.properties = properties; + public void init(String name, String id, Node propertiesNode) throws InvalidPluginPropertiesException { + this.propertiesNode = propertiesNode; this.name = name; this.id = id; } Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/ScorePlugin.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/ScorePlugin.java 2005-12-12 23:16:16 UTC (rev 1801) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/ScorePlugin.java 2005-12-13 16:42:49 UTC (rev 1802) @@ -22,9 +22,10 @@ package org.jboss.forge.status.plugins; -import java.util.Map; import java.util.List; +import org.w3c.dom.Node; + /** * @author Pawel Wrzeszcz */ @@ -33,8 +34,8 @@ protected List<Plugin> plugins; - public void init(String name, String id, List<Plugin> plugins, Map<String,String> properties) throws InvalidPluginPropertiesException { + public void init(String name, String id, List<Plugin> plugins, Node propertiesNode) throws InvalidPluginPropertiesException { this.plugins = plugins; - init(name, id, properties); + init(name, id, propertiesNode); } } Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java 2005-12-12 23:16:16 UTC (rev 1801) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java 2005-12-13 16:42:49 UTC (rev 1802) @@ -22,10 +22,10 @@ package org.jboss.forge.status.plugins; -import java.util.Map; - import org.jboss.forge.common.projects.Projects; +import org.w3c.dom.Node; + /** * @author Pawel Wrzeszcz */ @@ -34,8 +34,8 @@ protected Projects projects; - public void init(String name, String id, Projects projects, Map<String,String> properties) throws InvalidPluginPropertiesException { + public void init(String name, String id, Projects projects, Node propertiesNode) throws InvalidPluginPropertiesException { this.projects = projects; - init(name, id, properties); + init(name, id, propertiesNode); } } |
|
From: <jbo...@li...> - 2005-12-12 21:50:26
|
Author: rl...@jb...
Date: 2005-12-12 16:50:02 -0500 (Mon, 12 Dec 2005)
New Revision: 1798
Modified:
trunk/labs/jbossbuild/projects/maven-plugins/maven-rmic-plugin/src/main/java/org/apache/maven/plugin/rmic/SunRmiCompiler.java
Log:
fix path seperator
Modified: trunk/labs/jbossbuild/projects/maven-plugins/maven-rmic-plugin/src/main/java/org/apache/maven/plugin/rmic/SunRmiCompiler.java
===================================================================
--- trunk/labs/jbossbuild/projects/maven-plugins/maven-rmic-plugin/src/main/java/org/apache/maven/plugin/rmic/SunRmiCompiler.java 2005-12-12 21:35:55 UTC (rev 1797)
+++ trunk/labs/jbossbuild/projects/maven-plugins/maven-rmic-plugin/src/main/java/org/apache/maven/plugin/rmic/SunRmiCompiler.java 2005-12-12 21:50:02 UTC (rev 1798)
@@ -125,7 +125,7 @@
for ( int i = 0; i < path.length; i++ )
{
File file = path[ i ];
- c += file.getAbsolutePath() + ";";
+ c += file.getAbsolutePath() + file.pathSeparatorChar;
}
|
|
From: <jbo...@li...> - 2005-12-12 21:36:06
|
Author: adamw Date: 2005-12-12 16:35:55 -0500 (Mon, 12 Dec 2005) New Revision: 1797 Added: trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/RdfDateFormat.java Modified: trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/FeedsDescriptor.java Log: http://jira.jboss.com/jira/browse/JBLAB-571 Modified: trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/FeedsDescriptor.java =================================================================== --- trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/FeedsDescriptor.java 2005-12-12 21:14:58 UTC (rev 1796) +++ trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/FeedsDescriptor.java 2005-12-12 21:35:55 UTC (rev 1797) @@ -336,7 +336,6 @@ } private final static String RFC_822_DATE = "EEE, d MMM yyyy HH:mm:ss Z"; - private final static String RFC_3339_DATE = "yyyy-MM-dd'T'HH:mm:ssZ"; private void generateShotokuFeeds(String portalName, Map<String, Node> feedDefs, Properties props) { @@ -376,7 +375,7 @@ vc.put("dateFormat", new SimpleDateFormat( dateFormat == null ? "MM/dd/yy" : dateFormat)); vc.put("rssDateFormat", new SimpleDateFormat(RFC_822_DATE)); - vc.put("rdfDateFormat", new SimpleDateFormat(RFC_3339_DATE)); + vc.put("rdfDateFormat", new RdfDateFormat()); vc.put("now", Calendar.getInstance().getTime()); vc.put("baseServerAddress", baseServerAddress); vc.put("escape", new TextEscaping()); Added: trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/RdfDateFormat.java =================================================================== --- trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/RdfDateFormat.java 2005-12-12 21:14:58 UTC (rev 1796) +++ trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/RdfDateFormat.java 2005-12-12 21:35:55 UTC (rev 1797) @@ -0,0 +1,23 @@ +package org.jboss.forge.feeds; + +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + * This is a class that formats dates according to RFC 3399. Standard java date + * formats are insufficient, becuase they format timezones incorrectly, for + * ex. as "-0100", whereas as stated in RFC 3399, Atom 0.3 specification, and + * as accepted by Rome, it should be "-01:00". + * @author Adam Warski (ad...@as...) + */ +public class RdfDateFormat { + private final static String RFC_3339_DATE = "yyyy-MM-dd'T'HH:mm:ss"; + private final static String ZONE = "Z"; + + public String format(Date date) { + String noZoneDate = new SimpleDateFormat(RFC_3339_DATE).format(date); + String zone = new SimpleDateFormat(ZONE).format(date); + + return noZoneDate + zone.substring(0, 3) + ":" + zone.substring(3, 5); + } +} |
Author: rl...@jb...
Date: 2005-12-12 16:14:58 -0500 (Mon, 12 Dec 2005)
New Revision: 1796
Modified:
trunk/labs/jbossbuild/projects/jboss/aop/pom.xml
trunk/labs/jbossbuild/projects/jboss/common/pom.xml
trunk/labs/jbossbuild/projects/jboss/container/pom.xml
trunk/labs/jbossbuild/projects/jboss/dependency/pom.xml
trunk/labs/jbossbuild/projects/jboss/dist/pom.xml
trunk/labs/jbossbuild/projects/jboss/j2ee/pom.xml
trunk/labs/jbossbuild/projects/jboss/j2se/pom.xml
trunk/labs/jbossbuild/projects/jboss/jmx/pom.xml
trunk/labs/jbossbuild/projects/jboss/kernel/pom.xml
trunk/labs/jbossbuild/projects/jboss/mbeans/pom.xml
trunk/labs/jbossbuild/projects/jboss/naming/pom.xml
trunk/labs/jbossbuild/projects/jboss/server/pom.xml
trunk/labs/jbossbuild/projects/jboss/system/pom.xml
trunk/labs/jbossbuild/projects/jboss/test/pom.xml
trunk/labs/jbossbuild/projects/jboss/transaction/pom.xml
Log:
update version of antrun
Modified: trunk/labs/jbossbuild/projects/jboss/aop/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/aop/pom.xml 2005-12-12 21:03:02 UTC (rev 1795)
+++ trunk/labs/jbossbuild/projects/jboss/aop/pom.xml 2005-12-12 21:14:58 UTC (rev 1796)
@@ -29,6 +29,7 @@
<plugin>
<!-- match the buildmagic output -->
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<!-- instruct maven that this plugin should be
Modified: trunk/labs/jbossbuild/projects/jboss/common/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/common/pom.xml 2005-12-12 21:03:02 UTC (rev 1795)
+++ trunk/labs/jbossbuild/projects/jboss/common/pom.xml 2005-12-12 21:14:58 UTC (rev 1796)
@@ -30,6 +30,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<!-- instruct maven that this plugin should be
Modified: trunk/labs/jbossbuild/projects/jboss/container/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/container/pom.xml 2005-12-12 21:03:02 UTC (rev 1795)
+++ trunk/labs/jbossbuild/projects/jboss/container/pom.xml 2005-12-12 21:14:58 UTC (rev 1796)
@@ -22,6 +22,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<!-- instruct maven that this plugin should be
Modified: trunk/labs/jbossbuild/projects/jboss/dependency/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/dependency/pom.xml 2005-12-12 21:03:02 UTC (rev 1795)
+++ trunk/labs/jbossbuild/projects/jboss/dependency/pom.xml 2005-12-12 21:14:58 UTC (rev 1796)
@@ -22,6 +22,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<!-- instruct maven that this plugin should be
Modified: trunk/labs/jbossbuild/projects/jboss/dist/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/dist/pom.xml 2005-12-12 21:03:02 UTC (rev 1795)
+++ trunk/labs/jbossbuild/projects/jboss/dist/pom.xml 2005-12-12 21:14:58 UTC (rev 1796)
@@ -35,6 +35,7 @@
-->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<id>builddist</id>
Modified: trunk/labs/jbossbuild/projects/jboss/j2ee/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/j2ee/pom.xml 2005-12-12 21:03:02 UTC (rev 1795)
+++ trunk/labs/jbossbuild/projects/jboss/j2ee/pom.xml 2005-12-12 21:14:58 UTC (rev 1796)
@@ -24,6 +24,7 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<phase>package</phase>
Modified: trunk/labs/jbossbuild/projects/jboss/j2se/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/j2se/pom.xml 2005-12-12 21:03:02 UTC (rev 1795)
+++ trunk/labs/jbossbuild/projects/jboss/j2se/pom.xml 2005-12-12 21:14:58 UTC (rev 1796)
@@ -31,6 +31,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<!-- instruct maven that this plugin should be
Modified: trunk/labs/jbossbuild/projects/jboss/jmx/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/jmx/pom.xml 2005-12-12 21:03:02 UTC (rev 1795)
+++ trunk/labs/jbossbuild/projects/jboss/jmx/pom.xml 2005-12-12 21:14:58 UTC (rev 1796)
@@ -21,6 +21,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<!-- instruct maven that this plugin should be
Modified: trunk/labs/jbossbuild/projects/jboss/kernel/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/kernel/pom.xml 2005-12-12 21:03:02 UTC (rev 1795)
+++ trunk/labs/jbossbuild/projects/jboss/kernel/pom.xml 2005-12-12 21:14:58 UTC (rev 1796)
@@ -23,6 +23,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<!-- instruct maven that this plugin should be
Modified: trunk/labs/jbossbuild/projects/jboss/mbeans/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/mbeans/pom.xml 2005-12-12 21:03:02 UTC (rev 1795)
+++ trunk/labs/jbossbuild/projects/jboss/mbeans/pom.xml 2005-12-12 21:14:58 UTC (rev 1796)
@@ -21,6 +21,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<!-- instruct maven that this plugin should be
Modified: trunk/labs/jbossbuild/projects/jboss/naming/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/naming/pom.xml 2005-12-12 21:03:02 UTC (rev 1795)
+++ trunk/labs/jbossbuild/projects/jboss/naming/pom.xml 2005-12-12 21:14:58 UTC (rev 1796)
@@ -39,6 +39,7 @@
<plugin>
<!-- match the buildmagic output -->
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<!-- instruct maven that this plugin should be
Modified: trunk/labs/jbossbuild/projects/jboss/server/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/server/pom.xml 2005-12-12 21:03:02 UTC (rev 1795)
+++ trunk/labs/jbossbuild/projects/jboss/server/pom.xml 2005-12-12 21:14:58 UTC (rev 1796)
@@ -142,6 +142,7 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<phase>package</phase>
Modified: trunk/labs/jbossbuild/projects/jboss/system/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/system/pom.xml 2005-12-12 21:03:02 UTC (rev 1795)
+++ trunk/labs/jbossbuild/projects/jboss/system/pom.xml 2005-12-12 21:14:58 UTC (rev 1796)
@@ -60,6 +60,7 @@
<!-- match the output of the buildmagic build -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<!--instruct maven that this plugin should be
Modified: trunk/labs/jbossbuild/projects/jboss/test/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/test/pom.xml 2005-12-12 21:03:02 UTC (rev 1795)
+++ trunk/labs/jbossbuild/projects/jboss/test/pom.xml 2005-12-12 21:14:58 UTC (rev 1796)
@@ -22,6 +22,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<!-- instruct maven that this plugin should be
Modified: trunk/labs/jbossbuild/projects/jboss/transaction/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/transaction/pom.xml 2005-12-12 21:03:02 UTC (rev 1795)
+++ trunk/labs/jbossbuild/projects/jboss/transaction/pom.xml 2005-12-12 21:14:58 UTC (rev 1796)
@@ -33,6 +33,7 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<phase>package</phase>
|
|
From: <jbo...@li...> - 2005-12-12 21:03:12
|
Author: adamw Date: 2005-12-12 16:03:02 -0500 (Mon, 12 Dec 2005) New Revision: 1795 Added: trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogConfigurationWatcher.java Modified: trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java trunk/forge/portal-extensions/forge-blog/src/web/WEB-INF/portlet.xml Log: http://jira.jboss.com/jira/browse/JBLAB-572 Added: trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogConfigurationWatcher.java =================================================================== --- trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogConfigurationWatcher.java 2005-12-12 18:56:22 UTC (rev 1794) +++ trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogConfigurationWatcher.java 2005-12-12 21:03:02 UTC (rev 1795) @@ -0,0 +1,45 @@ +package org.jboss.portlet.blog; + +import java.io.IOException; +import java.util.Properties; + +import org.jboss.forge.common.service.NodeWatcher; +import org.jboss.forge.common.service.ResourceWatcher; +import org.jboss.shotoku.ContentManager; +import org.jboss.shotoku.exceptions.ResourceDoesNotExist; + +public class BlogConfigurationWatcher implements NodeWatcher { + private final static String CONFIG_FILE_NAME = "blog/blog.properties"; + private ResourceWatcher rw; + private ContentManager cm; + + public Properties getProperties() { + try { + Properties ret = new Properties(); + ret.load(cm.getNode(CONFIG_FILE_NAME).getContentInputStream()); + return ret; + } catch (IOException e) { + e.printStackTrace(); + } catch (ResourceDoesNotExist e) { + // Well ... + e.printStackTrace(); + } + + return null; + } + + public Object init(String portalName) { + cm = ContentManager.getContentManager(portalName); + rw = new ResourceWatcher(cm); + rw.watchResource(CONFIG_FILE_NAME); + return getProperties(); + } + + public Object nodeUpdate(String portalName, Object currentValue) { + if (rw.checkResources()) { + return getProperties(); + } else { + return null; + } + } +} Modified: trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java =================================================================== --- trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java 2005-12-12 18:56:22 UTC (rev 1794) +++ trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java 2005-12-12 21:03:02 UTC (rev 1795) @@ -29,9 +29,9 @@ import java.util.Date; import java.util.Iterator; import java.util.List; +import java.util.Properties; import javax.portlet.PortalContext; -import javax.portlet.PortletConfig; import javax.portlet.PortletException; import javax.portlet.PortletRequestDispatcher; import javax.portlet.WindowState; @@ -81,25 +81,34 @@ throws IOException { response.setContentType("text/html"); + String portalName = ForgeHelper.getPortalName(request); + + String configCacheKey = BlogPortlet.class.getName() + "/configuration"; + Properties config = (Properties) ForgeHelper.getForgeManagement().getFromCache( + portalName, configCacheKey); + + if (config == null) { + config = (Properties) ForgeHelper.getForgeManagement(). + addNodeWatcher(portalName, configCacheKey, + new BlogConfigurationWatcher()); + } + PortalContext portalCtx = request.getPortalContext(); - PortletConfig pConfig = getPortletConfig(); String projectId = ProjectsHelper.getSelectedProjectId(request, false); if (projectId == null) - projectId = pConfig.getInitParameter("defaultFeed"); - - String portalName = ForgeHelper.getPortalName(request); + projectId = config.getProperty("default.feed"); // Getting the number of headers and entries to display int headersNormal = Integer.valueOf( - pConfig.getInitParameter("headersNormal")).intValue(); + config.getProperty("headers.normal")).intValue(); int headersMaximized = Integer.valueOf( - pConfig.getInitParameter("headersMaximized")).intValue(); + config.getProperty("headers.maximized")).intValue(); int defShowEntries = Integer.valueOf( - pConfig.getInitParameter("showEntries")).intValue(); + config.getProperty("show.entries")).intValue(); - String feedAddress = pConfig.getInitParameter("feedAddress"); - String remoteFeedAddress = pConfig.getInitParameter("remoteFeedAddress"); + String feedAddress = config.getProperty("feed.address"); + String remoteFeedAddress = config.getProperty("remote.feed.address"); feedAddress = replaceProperty(feedAddress, "${host.address}", request .getServerName()); @@ -112,7 +121,7 @@ else feedAddress = replaceProperty(feedAddress, "${project.name}", "default"); feedAddress = replaceProperty(feedAddress, "${portal.name}", portalName); - feedAddress = replaceProperty(feedAddress, "${feed.type}", "rss2"); + feedAddress = replaceProperty(feedAddress, "${feed.type}", config.getProperty("default.feed.type")); remoteFeedAddress = replaceProperty(remoteFeedAddress, "${host.address}", request .getServerName()); Modified: trunk/forge/portal-extensions/forge-blog/src/web/WEB-INF/portlet.xml =================================================================== --- trunk/forge/portal-extensions/forge-blog/src/web/WEB-INF/portlet.xml 2005-12-12 18:56:22 UTC (rev 1794) +++ trunk/forge/portal-extensions/forge-blog/src/web/WEB-INF/portlet.xml 2005-12-12 21:03:02 UTC (rev 1795) @@ -10,37 +10,6 @@ <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode> </supports> - <init-param> - <description>Number of headers to display in a normal, not-main portlet. The following - should be true: headersNormal (less or equal to) showEntries+headersMaximized.</description> - <name>headersNormal</name> - <value>50</value> - </init-param> - <init-param> - <description>Number of entries to display in a main page or maximized portlet.</description> - <name>showEntries</name> - <value>50</value> - </init-param> - <init-param> - <description>Number of headers to display in a main page or maximized portlet.</description> - <name>headersMaximized</name> - <value>50</value> - </init-param> - <init-param> - <description>Address of the blog's local feed.</description> - <name>feedAddress</name> - <value>${scheme.name}://${host.address}:${host.port}/feeds/${project.name}/${feed.type}</value> - </init-param> - <init-param> - <description>Address of the blog's remote feed.</description> - <name>remoteFeedAddress</name> - <value>${scheme.name}://${host.address}:${host.port}/feeds/${project.name}/${feed.type}</value> - </init-param> - <init-param> - <description>Default feed to display.</description> - <name>defaultFeed</name> - <value>all</value> - </init-param> <portlet-info> <title>JBoss Blog Portlet</title> </portlet-info> |
|
From: <jbo...@li...> - 2005-12-12 18:56:32
|
Author: rl...@jb...
Date: 2005-12-12 13:56:22 -0500 (Mon, 12 Dec 2005)
New Revision: 1794
Modified:
trunk/labs/jbossbuild/projects/maven-plugins/javacc-maven-plugin/src/main/java/org/codehaus/mojo/javacc/JavaCCMojo.java
Log:
fix new dir creation
Modified: trunk/labs/jbossbuild/projects/maven-plugins/javacc-maven-plugin/src/main/java/org/codehaus/mojo/javacc/JavaCCMojo.java
===================================================================
--- trunk/labs/jbossbuild/projects/maven-plugins/javacc-maven-plugin/src/main/java/org/codehaus/mojo/javacc/JavaCCMojo.java 2005-12-12 18:32:24 UTC (rev 1793)
+++ trunk/labs/jbossbuild/projects/maven-plugins/javacc-maven-plugin/src/main/java/org/codehaus/mojo/javacc/JavaCCMojo.java 2005-12-12 18:56:22 UTC (rev 1794)
@@ -212,12 +212,7 @@
}
else
{
- try {
- outputDirectory.createNewFile();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ FileUtils.mkdir(outputDirectory.getAbsolutePath());
}
}
|
|
From: <jbo...@li...> - 2005-12-12 18:32:32
|
Author: rl...@jb...
Date: 2005-12-12 13:32:24 -0500 (Mon, 12 Dec 2005)
New Revision: 1793
Modified:
trunk/labs/jbossbuild/projects/jboss/system/pom.xml
Log:
update version number
Modified: trunk/labs/jbossbuild/projects/jboss/system/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/system/pom.xml 2005-12-12 17:36:15 UTC (rev 1792)
+++ trunk/labs/jbossbuild/projects/jboss/system/pom.xml 2005-12-12 18:32:24 UTC (rev 1793)
@@ -23,6 +23,7 @@
<plugin>
<groupId>com.stchome.maven.plugins</groupId>
<artifactId>artifact-utils</artifactId>
+ <version>1.1-jboss</version>
<executions>
<execution>
<id>explode</id>
|
|
From: <jbo...@li...> - 2005-12-12 17:36:23
|
Author: rl...@jb...
Date: 2005-12-12 12:36:15 -0500 (Mon, 12 Dec 2005)
New Revision: 1792
Modified:
trunk/labs/jbossbuild/projects/jboss/dist/pom.xml
Log:
update
Modified: trunk/labs/jbossbuild/projects/jboss/dist/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/dist/pom.xml 2005-12-12 17:14:53 UTC (rev 1791)
+++ trunk/labs/jbossbuild/projects/jboss/dist/pom.xml 2005-12-12 17:36:15 UTC (rev 1792)
@@ -155,7 +155,7 @@
<artifactItem>
<groupId>apache-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0</version>
+ <version>1.0.4-jboss</version>
<type>jar</type>
<rename>commons-logging.jar</rename>
<location>${basedir}/jboss-${version}/lib</location>
|
|
From: <jbo...@li...> - 2005-12-12 17:14:57
|
Author: rl...@jb...
Date: 2005-12-12 12:14:53 -0500 (Mon, 12 Dec 2005)
New Revision: 1791
Modified:
trunk/labs/jbossbuild/projects/jboss/dist/pom.xml
Log:
update
Modified: trunk/labs/jbossbuild/projects/jboss/dist/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/dist/pom.xml 2005-12-12 17:09:52 UTC (rev 1790)
+++ trunk/labs/jbossbuild/projects/jboss/dist/pom.xml 2005-12-12 17:14:53 UTC (rev 1791)
@@ -153,7 +153,7 @@
<overWrite>true</overWrite>
</artifactItem>
<artifactItem>
- <groupId>commons-logging</groupId>
+ <groupId>apache-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0</version>
<type>jar</type>
|
|
From: <jbo...@li...> - 2005-12-12 17:09:57
|
Author: rl...@jb...
Date: 2005-12-12 12:09:52 -0500 (Mon, 12 Dec 2005)
New Revision: 1790
Modified:
trunk/labs/jbossbuild/projects/jboss/dist/pom.xml
Log:
update
Modified: trunk/labs/jbossbuild/projects/jboss/dist/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/dist/pom.xml 2005-12-12 17:09:36 UTC (rev 1789)
+++ trunk/labs/jbossbuild/projects/jboss/dist/pom.xml 2005-12-12 17:09:52 UTC (rev 1790)
@@ -136,6 +136,7 @@
<plugin>
<groupId>com.stchome.maven.plugins</groupId>
<artifactId>artifact-utils</artifactId>
+ <version>1.1-jboss</version>
<executions>
<execution>
<id>copyfiles</id>
|
|
From: <jbo...@li...> - 2005-12-12 17:09:43
|
Author: rl...@jb...
Date: 2005-12-12 12:09:36 -0500 (Mon, 12 Dec 2005)
New Revision: 1789
Modified:
trunk/labs/jbossbuild/projects/jboss/server/pom.xml
Log:
update
Modified: trunk/labs/jbossbuild/projects/jboss/server/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/server/pom.xml 2005-12-12 17:03:56 UTC (rev 1788)
+++ trunk/labs/jbossbuild/projects/jboss/server/pom.xml 2005-12-12 17:09:36 UTC (rev 1789)
@@ -74,6 +74,7 @@
<!--define how the rmic should take place -->
<plugin>
<artifactId>maven-rmic-plugin</artifactId>
+ <version>1.0-alpha-1-SNAPSHOT</version>
<executions>
<execution>
<phase>compile</phase>
@@ -362,9 +363,9 @@
<version>5.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>jboss-remoting</groupId>
+ <groupId>jboss</groupId>
<artifactId>jboss-remoting</artifactId>
- <version>SNAPSHOT</version>
+ <version>5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
|
Author: adamw
Date: 2005-12-12 12:03:56 -0500 (Mon, 12 Dec 2005)
New Revision: 1788
Modified:
trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java
trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/FeedsDescriptor.java
trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/StandaloneTest.java
Log:
Blog changed to read from rss2
Modified: trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java
===================================================================
--- trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java 2005-12-12 16:51:33 UTC (rev 1787)
+++ trunk/forge/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java 2005-12-12 17:03:56 UTC (rev 1788)
@@ -112,7 +112,7 @@
else
feedAddress = replaceProperty(feedAddress, "${project.name}", "default");
feedAddress = replaceProperty(feedAddress, "${portal.name}", portalName);
- feedAddress = replaceProperty(feedAddress, "${feed.type}", "atom");
+ feedAddress = replaceProperty(feedAddress, "${feed.type}", "rss2");
remoteFeedAddress = replaceProperty(remoteFeedAddress, "${host.address}", request
.getServerName());
@@ -304,7 +304,7 @@
root.put("atomFeed", ForgeHelper.replace(feedTypeFreeAddress,
"${feed.type}", "atom"));
root.put("rssFeed", ForgeHelper.replace(feedTypeFreeAddress,
- "${feed.type}", "rss"));
+ "${feed.type}", "rss2"));
root.put("xmlFeed", ForgeHelper.replace(feedTypeFreeAddress,
"${feed.type}", "rdf"));
Modified: trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/FeedsDescriptor.java
===================================================================
--- trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/FeedsDescriptor.java 2005-12-12 16:51:33 UTC (rev 1787)
+++ trunk/forge/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/FeedsDescriptor.java 2005-12-12 17:03:56 UTC (rev 1788)
@@ -336,7 +336,7 @@
}
private final static String RFC_822_DATE = "EEE, d MMM yyyy HH:mm:ss Z";
- private final static String RFC_3339_DATE = "yyyy-MM-dd'T'HH:mm:ss.SSSZ";
+ private final static String RFC_3339_DATE = "yyyy-MM-dd'T'HH:mm:ssZ";
private void generateShotokuFeeds(String portalName,
Map<String, Node> feedDefs, Properties props) {
Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/StandaloneTest.java
===================================================================
--- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/StandaloneTest.java 2005-12-12 16:51:33 UTC (rev 1787)
+++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/StandaloneTest.java 2005-12-12 17:03:56 UTC (rev 1788)
@@ -502,7 +502,7 @@
printMap(properties);*/
- propsTest();
+ //propsTest();
//testCopy();
//multiSaveTest();
//testInject();
|
|
From: <jbo...@li...> - 2005-12-12 16:51:48
|
Author: rl...@jb...
Date: 2005-12-12 11:51:33 -0500 (Mon, 12 Dec 2005)
New Revision: 1787
Removed:
trunk/labs/jbossbuild/projects/jboss/server/file1.txt
Modified:
trunk/labs/jbossbuild/projects/jboss/server/pom.xml
Log:
update
Deleted: trunk/labs/jbossbuild/projects/jboss/server/file1.txt
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/server/file1.txt 2005-12-12 16:29:29 UTC (rev 1786)
+++ trunk/labs/jbossbuild/projects/jboss/server/file1.txt 2005-12-12 16:51:33 UTC (rev 1787)
@@ -1,59 +0,0 @@
-/cygdrive/c/j2sdk1.4.2_08/bin/java -classpath c:\maven\maven-2.0/core/boot/classworlds-1.1-alpha-2.jar -Dclassworlds.conf=c:\maven\maven-2.0/bin/m2.conf -Dmaven.home=c:\maven\maven-2.0 org.codehaus.classworlds.Launcher compile
-[INFO] Scanning for projects...
-[INFO] ----------------------------------------------------------------------------
-[INFO] Building Server Project
-[INFO] task-segment: [compile]
-[INFO] ----------------------------------------------------------------------------
-[INFO] [javacc:jjtree {execution: jjtree}]
-[INFO] Generating grammar for single file: JBossQLParser.jjt
-Java Compiler Compiler Version 3.2 (Tree Builder)
-(type "jjtree" with no arguments for help)
-Reading from file c:\projects\maven-jboss-head\jboss-head\server\src\main\org\jboss\ejb\plugins\cmp\ejbql\JBossQLParser.jjt . . .
-File "c:\projects\maven-jboss-head\jboss-head\server\target\gensrc\org\jboss\ejb\plugins\cmp\ejbql\Node.java" does not exist. Will create one.
-Annotated grammar generated successfully in c:\projects\maven-jboss-head\jboss-head\server\target\gensrc\org\jboss\ejb\plugins\cmp\ejbql\JBossQLParser.jj
-[INFO] [javacc:jjtree {execution: jjtree-ejblq}]
-[INFO] Generating grammar for single file: EJBQLParser.jjt
-Java Compiler Compiler Version 3.2 (Tree Builder)
-(type "jjtree" with no arguments for help)
-Reading from file c:\projects\maven-jboss-head\jboss-head\server\src\main\org\jboss\ejb\plugins\cmp\ejbql\EJBQLParser.jjt . . .
-Annotated grammar generated successfully in c:\projects\maven-jboss-head\jboss-head\server\target\gensrc\org\jboss\ejb\plugins\cmp\ejbql\EJBQLParser.jj
-[INFO] [javacc:javacc {execution: javacc}]
-Java Compiler Compiler Version 3.2 (Parser Generator)
-(type "javacc" with no arguments for help)
-Reading from file c:\projects\maven-jboss-head\jboss-head\server\target\gensrc\org\jboss\ejb\plugins\cmp\ejbql\JBossQLParser.jj . . .
-File "TokenMgrError.java" does not exist. Will create one.
-File "ParseException.java" does not exist. Will create one.
-File "Token.java" does not exist. Will create one.
-File "JavaCharStream.java" does not exist. Will create one.
-Parser generated with 0 errors and 2 warnings.
-Java Compiler Compiler Version 3.2 (Parser Generator)
-(type "javacc" with no arguments for help)
-Reading from file c:\projects\maven-jboss-head\jboss-head\server\target\gensrc\org\jboss\ejb\plugins\cmp\ejbql\EJBQLParser.jj . . .
-Parser generated with 0 errors and 2 warnings.
-[INFO] [resources:resources]
-[INFO] Using default encoding to copy filtered resources.
-Downloading: http://repo1.maven.org/maven2/gnu-getopt/getopt/1.0.10/getopt-1.0.10.pom
-[WARNING] Unable to get resource from repository central (http://repo1.maven.org/maven2)
-Downloading: http://repo1.maven.org/maven2/jpl-util/jpl-util/1.0/jpl-util-1.0.pom
-[WARNING] Unable to get resource from repository central (http://repo1.maven.org/maven2)
-Downloading: http://repo1.maven.org/maven2/jpl-pattern/jpl-pattern/1.0/jpl-pattern-1.0.pom
-[WARNING] Unable to get resource from repository central (http://repo1.maven.org/maven2)
-[INFO] [compiler:compile]
-Compiling 692 source files to c:\projects\maven-jboss-head\jboss-head\server\output\classes
-[INFO] [rmic:process-classes {execution: default}]
-[INFO] rmic arguments:
-[INFO] -classpath
-[INFO] c:\projects\maven-jboss-head\jboss-head\server\output\classes;c:\projects\maven-jboss-head\jboss-head\server\output\classes;C:\Documents and Settings\ruel\.m2\repository\junit\junit\3.8.1\junit-3.8.1.jar;C:\Documents and Settings\ruel\.m2\repository\apache-log4j\snmpTrapAppender\1.2.8\snmpTrapAppender-1.2.8.jar;C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\system\jboss-system\5.0-SNAPSHOT\jboss-system-5.0-SNAPSHOT.jar;C:\Documents and Settings\ruel\.m2\repository\apache-xerces\resolver\2.7.0\resolver-2.7.0.jar;C:\Documents and Settings\ruel\.m2\repository\apache-jaxme\jaxmexs\0.2-cvs\jaxmexs-0.2-cvs.jar;C:\Documents and Settings\ruel\.m2\repository\sun-servlet-jsp\jsp-api\2.4\jsp-api-2.4.jar;C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\transaction\jboss-transaction\5.0-SNAPSHOT\jboss-transaction-5.0-SNAPSHOT.jar;C:\Documents and Settings\ruel\.m2\repository\sun-servlet\servlet-api\2.4\servlet-api-2.4.jar;C:\Documents and Settings\ru!
el\.m2\repository\wutka-dtdparser\dtdparser121\1.2.1\dtdparser121-1.2.1.jar;C:\Documents and Settings\ruel\.m2\repository\gnu-regexp\gnu-regexp\1.1.14\gnu-regexp-1.1.14.jar;C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\common\jboss-common\5.0-SNAPSHOT\jboss-common-5.0-SNAPSHOT.jar;C:\Documents and Settings\ruel\.m2\repository\dom4j\dom4j\1.5\dom4j-1.5.jar;C:\Documents and Settings\ruel\.m2\repository\apache-xerces\xercesImpl\2.7.0\xercesImpl-2.7.0.jar;C:\Documents and Settings\ruel\.m2\repository\jaxen\jaxen\1.1-beta-4\jaxen-1.1-beta-4.jar;C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\j2se\jboss-j2se\5.0-SNAPSHOT\jboss-j2se-5.0-SNAPSHOT.jar;C:\Documents and Settings\ruel\.m2\repository\jpl-pattern\jpl-pattern\1.0\jpl-pattern-1.0.jar;C:\Documents and Settings\ruel\.m2\repository\apache-xerces\xml-apis\2.7.0\xml-apis-2.7.0.jar;C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\naming\jnpserver\5.0-SNAPSHOT\jnpserver-5.0-SNAPSHOT.j!
ar;C:\Documents and Settings\ruel\.m2\repository\apache-log4j\log4j\1.
2.8\log4j-1.2.8.jar;C:\Documents and Settings\ruel\.m2\repository\oswego-concurrent\concurrent\1.3.4\concurrent-1.3.4.jar;C:\Documents and Settings\ruel\.m2\repository\apache-slide\webdavlib\2.0\webdavlib-2.0.jar;C:\Documents and Settings\ruel\.m2\repository\jboss-remoting\jboss-remoting\SNAPSHOT\jboss-remoting-SNAPSHOT.jar;C:\Documents and Settings\ruel\.m2\repository\gnu-getopt\getopt\1.0.10\getopt-1.0.10.jar;C:\Documents and Settings\ruel\.m2\repository\bcel\bcel\5.1\bcel-5.1.jar;C:\Documents and Settings\ruel\.m2\repository\jpl-util\jpl-util\1.0\jpl-util-1.0.jar;C:\Documents and Settings\ruel\.m2\repository\sun-jaf\activation\1.2.4\activation-1.2.4.jar;C:\Documents and Settings\ruel\.m2\repository\apache-httpclient\commons-httpclient\2.0\commons-httpclient-2.0.jar;C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\j2ee\jboss-j2ee\5.0-SNAPSHOT\jboss-j2ee-5.0-SNAPSHOT.jar;C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\mbeans\jboss-mbeans\5.0-SNA!
PSHOT\jboss-mbeans-5.0-SNAPSHOT.jar;C:\Documents and Settings\ruel\.m2\repository\wsdl4j\wsdl4j\1.5.1\wsdl4j-1.5.1.jar;
-[INFO] -d
-[INFO] c:\projects\maven-jboss-head\jboss-head\server\output\classes
-[INFO] -v1.2
-[INFO] org.jboss.tm.usertx.server.UserTransactionSessionFactoryImpl
-[INFO] org.jboss.tm.usertx.server.UserTransactionSessionImpl
-[INFO] RMIC completed.
-[INFO] ----------------------------------------------------------------------------
-[INFO] BUILD SUCCESSFUL
-[INFO] ----------------------------------------------------------------------------
-[INFO] Total time: 22 seconds
-[INFO] Finished at: Tue Dec 06 10:40:56 CST 2005
-[INFO] Final Memory: 8M/52M
-[INFO] ----------------------------------------------------------------------------
Modified: trunk/labs/jbossbuild/projects/jboss/server/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/server/pom.xml 2005-12-12 16:29:29 UTC (rev 1786)
+++ trunk/labs/jbossbuild/projects/jboss/server/pom.xml 2005-12-12 16:51:33 UTC (rev 1787)
@@ -110,6 +110,7 @@
<plugin>
<groupId>com.stchome.maven.plugins</groupId>
<artifactId>artifact-utils</artifactId>
+ <version>1.1-jboss</version>
<executions>
<execution>
<id>explode</id>
|
|
From: <jbo...@li...> - 2005-12-12 16:29:42
|
Author: rl...@jb...
Date: 2005-12-12 11:29:29 -0500 (Mon, 12 Dec 2005)
New Revision: 1786
Modified:
trunk/labs/jbossbuild/projects/jboss/transaction/pom.xml
Log:
fix name
Modified: trunk/labs/jbossbuild/projects/jboss/transaction/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/transaction/pom.xml 2005-12-12 16:21:43 UTC (rev 1785)
+++ trunk/labs/jbossbuild/projects/jboss/transaction/pom.xml 2005-12-12 16:29:29 UTC (rev 1786)
@@ -96,7 +96,7 @@
</dependency>
<dependency>
<groupId>jboss</groupId>
- <artifactId>remoting</artifactId>
+ <artifactId>jboss-remoting</artifactId>
<version>5.0-SNAPSHOT</version>
</dependency>
</dependencies>
|
|
From: <jbo...@li...> - 2005-12-12 16:21:50
|
Author: rl...@jb...
Date: 2005-12-12 11:21:43 -0500 (Mon, 12 Dec 2005)
New Revision: 1785
Modified:
trunk/labs/jbossbuild/projects/jboss/naming/pom.xml
Log:
update version number
Modified: trunk/labs/jbossbuild/projects/jboss/naming/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/naming/pom.xml 2005-12-12 15:52:36 UTC (rev 1784)
+++ trunk/labs/jbossbuild/projects/jboss/naming/pom.xml 2005-12-12 16:21:43 UTC (rev 1785)
@@ -18,6 +18,7 @@
<plugins>
<plugin>
<artifactId>maven-rmic-plugin</artifactId>
+ <version>1.0-alpha-1-SNAPSHOT</version>
<executions>
<execution>
<phase>compile</phase>
|
|
From: <jbo...@li...> - 2005-12-12 15:52:39
|
Author: rl...@jb...
Date: 2005-12-12 10:52:36 -0500 (Mon, 12 Dec 2005)
New Revision: 1784
Added:
trunk/labs/jbossbuild/projects/jboss/dist/
trunk/labs/jbossbuild/projects/jboss/dist/pom.xml
Modified:
trunk/labs/jbossbuild/projects/jboss/build/pom.xml
trunk/labs/jbossbuild/projects/jboss/mbeans/pom.xml
Log:
update
Modified: trunk/labs/jbossbuild/projects/jboss/build/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/build/pom.xml 2005-12-12 15:47:26 UTC (rev 1783)
+++ trunk/labs/jbossbuild/projects/jboss/build/pom.xml 2005-12-12 15:52:36 UTC (rev 1784)
@@ -5,6 +5,9 @@
<artifactId>app</artifactId>
<name>server</name>
<packaging>pom</packaging>
+
+ <!-- define a list of modules which we will need to build in addition
+ to the current one -->
<modules>
<module>../common</module>
<module>../j2se</module>
@@ -19,60 +22,70 @@
<module>../aop</module>
<module>../j2ee</module>
<module>../transaction</module>
- <module>../server</module>
+ <module>../server</module>
+ <module>../dist</module>
</modules>
-
-
- <build>
+ <!-- describe the build process -->
+ <build>
+ <!--a plugin is how achieve a unit of work, a build is made up a series of plugins -->
+ <plugins>
+ <!-- define a custom clean plugin and configure it to include the cleaning
+ of an additional directory
+
+ because this is a top level build, the plugins we define here will be inherited
+ by the builds in the child modules -->
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.0-jboss</version>
+ <configuration>
+ <additionalDirs>
+ <additionalDir>${basedir}/output</additionalDir>
+ </additionalDirs>
+ </configuration>
+ </plugin>
-
-
- <!--define the regular list of plugins -->
-
- <plugins>
- <plugin>
-
- <artifactId>maven-clean-plugin</artifactId>
+ <!-- define how we want compilation to take place
+ here, we accept most of the defaults but say that we want the
+ optimization flag set, and define the source and target to be 1.4,
+ these setting will be inherited by child projects -->
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <additionalDirs>
- <additionalDir>${basedir}/output</additionalDir>
- </additionalDirs>
+ <optimize>true</optimize>
+ <source>1.4</source>
+ <target>1.4</target>
</configuration>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <inherited>false</inherited>
- <id>builddist</id>
- <phase>package</phase>
- <configuration>
- <tasks>
-
- <echo message="basedir is ${basedir}"/>
- <mkdir dir="${basedir}/jboss-${version}"/>
- <mkdir dir="${basedir}/jboss-${version}/bin"/>
- <mkdir dir="${basedir}/jboss-${version}/client"/>
- <mkdir dir="${basedir}/jboss-${version}/docs"/>
- <mkdir dir="${basedir}/jboss-${version}/lib"/>
- <mkdir dir="${basedir}/jboss-${version}/server"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
- </plugin>
-
-
-
-
+ </plugin>
</plugins>
-
</build>
-
+ <!-- define the repository we wish to use -->
+ <!-- by giving it the id of central -->
+ <repositories>
+ <repository>
+ <id>central</id>
+ <name>JBoss Repository</name>
+ <url>http://repository.jboss.com/maven2</url>
+ <layout>default</layout>
+ </repository>
+ </repositories>
+
+ <!-- define the plugin repository we wish to use -->
+ <!-- notice, we turn off the automatic update of items with SNAPSHOT -->
+ <!-- versions. It's very slow, they will only be downloaded if they do -->
+ <!-- not exist locally-->
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss plugin repo</id>
+ <name>jboss plugin repository</name>
+ <url>http://repository.jboss.com/maven2</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
</project>
Added: trunk/labs/jbossbuild/projects/jboss/dist/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/dist/pom.xml 2005-12-12 15:47:26 UTC (rev 1783)
+++ trunk/labs/jbossbuild/projects/jboss/dist/pom.xml 2005-12-12 15:52:36 UTC (rev 1784)
@@ -0,0 +1,275 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.server.dist</groupId>
+ <version>5.0-SNAPSHOT</version>
+ <artifactId>jboss-dist</artifactId>
+ <packaging>pom</packaging>
+ <name>Server Distribution Project</name>
+ <description>JBoss Server Distribution Project</description>
+ <parent>
+ <artifactId>app</artifactId>
+ <groupId>org.jboss.server</groupId>
+ <version>5.0-SNAPSHOT</version>
+ </parent>
+ <build>
+
+ <plugins>
+ <!-- define a custom clean plugin and configure it to include the cleaning
+ of an additional directory -->
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <additionalDirs>
+ <additionalDir>${basedir}/jboss-${version}</additionalDir>
+ </additionalDirs>
+ </configuration>
+ </plugin>
+
+ <!-- define a plugin that executes during the package phase
+ to create our distribution, note that this plugin will
+ not be inherited by child modules -->
+
+ <!-- match the buildmagic output for a jboss distribution
+ this can later be replace with an official plugin
+ which defines the output schema in an official manner
+ -->
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>builddist</id>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+
+ <echo message="Building the jboss distribution"/>
+
+ <mkdir dir="${basedir}/jboss-${version}"/>
+ <mkdir dir="${basedir}/jboss-${version}/bin"/>
+ <mkdir dir="${basedir}/jboss-${version}/client"/>
+ <mkdir dir="${basedir}/jboss-${version}/docs"/>
+ <mkdir dir="${basedir}/jboss-${version}/lib"/>
+ <mkdir dir="${basedir}/jboss-${version}/lib/endorsed"/>
+ <mkdir dir="${basedir}/jboss-${version}/server"/>
+ <mkdir dir="${basedir}/jboss-${version}/server/minimal"/>
+ <mkdir dir="${basedir}/jboss-${version}/server/minimal/conf"/>
+ <mkdir dir="${basedir}/jboss-${version}/server/minimal/deploy"/> \
+ <mkdir dir="${basedir}/jboss-${version}/server/minimal/lib"/>
+
+ <!-- handle items going in the bin dir -->
+ <copy todir="${basedir}/jboss-${version}/bin" filtering="no">
+ <fileset dir="../server/src/bin">
+ <include name="**/*"/>
+ </fileset>
+ <fileset dir="../server/output/lib">
+ <include name="deployer.jar"/>
+ <include name="shutdown.jar"/>
+ </fileset>
+ <fileset dir="../system/src/bin">
+ <include name="**/*"/>
+ </fileset>
+ <fileset dir="../system/output/lib">
+ <include name="run.jar"/>
+ </fileset>
+ </copy>
+
+ <chmod perm="+x">
+ <fileset dir="${basedir}/jboss-${version}/bin">
+ <include name="**/*.sh"/>
+ </fileset>
+ </chmod>
+
+ <!-- move artifacts to lib dir -->
+ <copy todir="${basedir}/jboss-${version}/lib" filtering="no">
+ <fileset dir="../common/output/lib">
+ <include name="jboss-common.jar"/>
+ <include name="namespace.jar"/>
+ </fileset>
+ <fileset dir="../j2se/output/lib">
+ <include name="jboss-j2se.jar"/>
+ </fileset>
+ <fileset dir="../mbeans/output/lib">
+ <include name="jboss-mbeans.jar"/>
+ </fileset>
+ <fileset dir="../jmx/output/lib">
+ <include name="jboss-jmx.jar"/>
+ </fileset>
+ <fileset dir="../system/output/lib">
+ <include name="jboss-system.jar"/>
+ <include name="log4j-boot.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- move artifacts to minimal/lib -->
+ <copy todir="${basedir}/jboss-${version}/server/minimal/lib" filtering="no">
+ <!--<fileset dir="../management/output/lib">
+ <include name="jboss-management.jar"/>
+ </fileset>-->
+ <fileset dir="../naming/output/lib">
+ <include name="jnpserver.jar"/>
+ </fileset>
+ <fileset dir="../server/output/lib">
+ <include name="jboss-minimal.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- move artifacts to minimal/conf -->
+
+ <copy file="../server/src/etc/conf/default/jboss-minimal.xml"
+ tofile="${basedir}/jboss-${version}/server/minimal/conf/jboss-service.xml"/>
+ <copy todir="${basedir}/jboss-${version}/server/minimal/conf">
+ <fileset dir="../server/src/etc/conf/default">
+ <include name="jndi.properties" />
+ <include name="log4j.xml" />
+ </fileset>
+ </copy>
+
+
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>com.stchome.maven.plugins</groupId>
+ <artifactId>artifact-utils</artifactId>
+ <executions>
+ <execution>
+ <id>copyfiles</id>
+ <phase>package</phase>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>2.0</version>
+ <type>jar</type>
+ <rename>commons-httpclient.jar</rename>
+ <location>${basedir}/jboss-${version}/lib</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0</version>
+ <type>jar</type>
+ <rename>commons-logging.jar</rename>
+ <location>${basedir}/jboss-${version}/lib</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4</version>
+ <type>jar</type>
+ <rename>concurrent.jar</rename>
+ <location>${basedir}/jboss-${version}/lib</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.5</version>
+ <type>jar</type>
+ <rename>dom4j.jar</rename>
+ <location>${basedir}/jboss-${version}/lib</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>gnu-getopt</groupId>
+ <artifactId>getopt</artifactId>
+ <version>1.0.10</version>
+ <type>jar</type>
+ <rename>getopt.jar</rename>
+ <location>${basedir}/jboss-${version}/lib</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>gnu-regexp</groupId>
+ <artifactId>gnu-regexp</artifactId>
+ <version>1.1.14</version>
+ <type>jar</type>
+ <rename>gnu-regexp.jar</rename>
+ <location>${basedir}/jboss-${version}/lib</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1-beta-4</version>
+ <type>jar</type>
+ <rename>jaxen.jar</rename>
+ <location>${basedir}/jboss-${version}/lib</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ <version>2.0</version>
+ <type>jar</type>
+ <rename>webdavlib.jar</rename>
+ <location>${basedir}/jboss-${version}/lib</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>apache-xerces</groupId>
+ <artifactId>resolver</artifactId>
+ <version>2.7.0.</version>
+ <type>jar</type>
+ <rename>resolver.jar</rename>
+ <location>${basedir}/jboss-${version}/lib/endorsed</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.7.0</version>
+ <type>jar</type>
+ <rename>xercesImpl.jar</rename>
+ <location>${basedir}/jboss-${version}/lib/endorsed</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>2.7.0</version>
+ <type>jar</type>
+ <rename>xml-apis.jar</rename>
+ <location>${basedir}/jboss-${version}/lib/endorsed</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>apache-xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>j_2.6.0</version>
+ <type>jar</type>
+ <rename>xalan.jar</rename>
+ <location>${basedir}/jboss-${version}/lib/endorsed</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ <type>jar</type>
+ <rename>log4j.jar</rename>
+ <location>${basedir}/jboss-${version}/server/minimal/lib</location>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ </artifactItems>
+ <clean>true</clean>
+ <defaultWorkDirectory>output/workdir</defaultWorkDirectory>
+ </configuration>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Modified: trunk/labs/jbossbuild/projects/jboss/mbeans/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/mbeans/pom.xml 2005-12-12 15:47:26 UTC (rev 1783)
+++ trunk/labs/jbossbuild/projects/jboss/mbeans/pom.xml 2005-12-12 15:52:36 UTC (rev 1784)
@@ -66,7 +66,6 @@
<version>5.0-SNAPSHOT</version>
</dependency>
- <!--fix me with jboss version -->
<dependency>
<groupId>bcel</groupId>
<artifactId>bcel</artifactId>
|
|
From: <jbo...@li...> - 2005-12-12 15:47:33
|
Author: rl...@jb...
Date: 2005-12-12 10:47:26 -0500 (Mon, 12 Dec 2005)
New Revision: 1783
Modified:
trunk/labs/jbossbuild/projects/maven-plugins/artifact-utils/pom.xml
Log:
change version number
Modified: trunk/labs/jbossbuild/projects/maven-plugins/artifact-utils/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/maven-plugins/artifact-utils/pom.xml 2005-12-12 15:38:53 UTC (rev 1782)
+++ trunk/labs/jbossbuild/projects/maven-plugins/artifact-utils/pom.xml 2005-12-12 15:47:26 UTC (rev 1783)
@@ -4,7 +4,7 @@
<groupId>com.stchome.maven.plugins</groupId>
<artifactId>artifact-utils</artifactId>
<packaging>maven-plugin</packaging>
- <version>1.1</version>
+ <version>1.1-jboss</version>
<name>Artifact Utilities Plugin</name>
<dependencies>
<dependency>
|
|
From: <jbo...@li...> - 2005-12-12 15:38:59
|
Author: rl...@jb...
Date: 2005-12-12 10:38:53 -0500 (Mon, 12 Dec 2005)
New Revision: 1782
Modified:
trunk/labs/jbossbuild/projects/jboss/transaction/pom.xml
Log:
update
Modified: trunk/labs/jbossbuild/projects/jboss/transaction/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/transaction/pom.xml 2005-12-12 15:38:25 UTC (rev 1781)
+++ trunk/labs/jbossbuild/projects/jboss/transaction/pom.xml 2005-12-12 15:38:53 UTC (rev 1782)
@@ -95,9 +95,9 @@
<version>5.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>jboss-remoting</groupId>
- <artifactId>jboss-remoting</artifactId>
- <version>SNAPSHOT</version>
+ <groupId>jboss</groupId>
+ <artifactId>remoting</artifactId>
+ <version>5.0-SNAPSHOT</version>
</dependency>
</dependencies>
|
Author: dam...@jb... Date: 2005-12-12 10:38:25 -0500 (Mon, 12 Dec 2005) New Revision: 1781 Modified: qa/forge/portal-extensions/forge-kosmos/maven.xml qa/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java qa/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java qa/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/MediaDataSource.java qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuDataSource.java qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPage.java qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/GetRefsFromPagePlugin.java qa/forge/portal-extensions/jbosswiki/wiki-management/src/java/org/jboss/wiki/management/WikiService.java Log: MERGED: -r 1691:1718 https://svn.labs.jboss.com/trunk/forge into qa. This fixes the forge-kosmos services not running. This will be for the 1.0.7 release... again. Modified: qa/forge/portal-extensions/forge-kosmos/maven.xml =================================================================== --- qa/forge/portal-extensions/forge-kosmos/maven.xml 2005-12-12 15:27:32 UTC (rev 1780) +++ qa/forge/portal-extensions/forge-kosmos/maven.xml 2005-12-12 15:38:25 UTC (rev 1781) @@ -47,7 +47,7 @@ <!-- Deploying new packages --> <ant:copy todir="../${forge.ear.dir}/target/${forge.ear.name}" overwrite="true"> <ant:fileset dir="target"> - <ant:filename name="kosmos**/*" /> + <ant:filename name="kosmos*/**" /> </ant:fileset> </ant:copy> </goal> Modified: qa/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java =================================================================== --- qa/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2005-12-12 15:27:32 UTC (rev 1780) +++ qa/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2005-12-12 15:38:25 UTC (rev 1781) @@ -50,12 +50,13 @@ */ public class Status extends AbstractDescriptor { - private final static String PLUGIN_ELEMENT = "plugin"; + private final static String PLUGIN_ELEMENT = "plugin"; - private final static String PLUGIN_ID_ELEMENT = "id"; - private final static String PLUGIN_NAME_ELEMENT = "name"; - private final static String PLUGIN_CLASS_ELEMENT = "class"; - private final static String PLUGIN_WEIGHT_ELEMENT = "weight"; + private final static String PLUGIN_ID_ELEMENT = "id"; + private final static String PLUGIN_NAME_ELEMENT = "name"; + private final static String PLUGIN_CLASS_ELEMENT = "class"; + private final static String PLUGIN_WEIGHT_ELEMENT = "weight"; + private final static String PLUGIN_PROPERTIES_ELEMENT = "properties"; private String portalName; private ScoreAlgorithmFactory scoreAlgorithm; @@ -64,12 +65,15 @@ private List<StatusPlugin> plugins; private Logger log; + + private HashSet<String> pluginsElements; Status(String portalName, Node pluginsRoot, ScoreAlgorithmFactory scoreAlgorithm) { this.portalName = portalName; this.scoreAlgorithm = scoreAlgorithm; log = Logger.getLogger(this.getClass()); + initPluginElements(); // Get the projects projects = ProjectsHelper.getProjects(portalName); @@ -81,8 +85,18 @@ plugins = getPlugins(pluginsNodes); } + private void initPluginElements() { + pluginsElements = new HashSet<String>(); + + pluginsElements.add(PLUGIN_ID_ELEMENT); //TODO currently id is NOT used!! + pluginsElements.add(PLUGIN_NAME_ELEMENT); + pluginsElements.add(PLUGIN_CLASS_ELEMENT); + pluginsElements.add(PLUGIN_WEIGHT_ELEMENT); + pluginsElements.add(PLUGIN_PROPERTIES_ELEMENT); + } + - + /** * Fills the given context with podcast information. * @@ -146,51 +160,73 @@ } } - List<StatusPlugin> getPlugins(Set<Node> pluginsNodes) { + private List<StatusPlugin> getPlugins(Set<Node> pluginsNodes) { ArrayList<StatusPlugin> plugins = new ArrayList<StatusPlugin>(); - - HashSet<String> pluginsElements = new HashSet<String>(); - pluginsElements.add(PLUGIN_ID_ELEMENT); - pluginsElements.add(PLUGIN_NAME_ELEMENT); - pluginsElements.add(PLUGIN_CLASS_ELEMENT); - pluginsElements.add(PLUGIN_WEIGHT_ELEMENT); - + for (Iterator iter = pluginsNodes.iterator(); iter.hasNext();) { Node pluginNode = (Node) iter.next(); - Map<String,Node> pluginProperties = getChildNodesMap(pluginNode, pluginsElements); + StatusPlugin plugin = getPlugin(pluginNode); - // Get plugin name - String pluginClassString = XmlTools.unmarshallText(pluginProperties.get("class")); - System.out.println("pluginClassString " + pluginClassString); - - // Get plugin class - - Class pluginClass = null; - try { - pluginClass = Class.forName(pluginClassString); - } catch (ClassNotFoundException e) { - log.error("Plugin class not found: " + pluginClassString); - continue; - } - - // Get plugin instance - StatusPlugin plugin = null; - try { - plugin = (StatusPlugin) pluginClass.newInstance(); - } catch (Exception e) { - log.error("Plugin class: " + pluginClassString + ". Instantination failed.", e); - continue; - } - - // Initialize plugin and add it to the plugins set - plugin.init(projects); - plugins.add(plugin); + if (plugin != null) { + plugins.add(plugin); + } } return plugins; } + private StatusPlugin getPlugin(Node pluginNode) { + Map<String,Node> pluginProperties = getChildNodesMap(pluginNode, pluginsElements); + + // Get plugin name + String pluginClassString = XmlTools.unmarshallText(pluginProperties.get("class")); + System.out.println("pluginClassString " + pluginClassString); + + // Get plugin class + Class pluginClass = null; + try { + pluginClass = Class.forName(pluginClassString); + } catch (ClassNotFoundException e) { + log.error("Plugin class not found: " + pluginClassString); + return null; + } + + // Get plugin instance + StatusPlugin plugin = null; + try { + plugin = (StatusPlugin) pluginClass.newInstance(); + } catch (Exception e) { + log.error("Plugin class: " + pluginClassString + ". Instantination failed.", e); + return null; + } + + // Get plugin properies node + Node pluginSpecificPropertiesNode = pluginProperties.get("properties"); + Map<String,String> pluginSpecificPropertiesMap = getChildNodesStringMap(pluginSpecificPropertiesNode); + + // Initialize plugin + plugin.init(projects, pluginSpecificPropertiesMap); + + return plugin; + } + + + + private Map<String,String> getChildNodesStringMap(Node root) { + HashMap<String,String> ret = new HashMap<String,String>(); + NodeList list = root.getChildNodes(); + + for (int i = 0; i < list.getLength(); i++) { + Node n = list.item(i); + if (n.getNodeType() == Node.ELEMENT_NODE) { + ret.put(n.getNodeName(),XmlTools.unmarshallText(n)); + } + } + + return ret; + } + private int calculateScore(String projectId) { return scoreAlgorithm.calculateScore(projectId, plugins); } Modified: qa/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java =================================================================== --- qa/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java 2005-12-12 15:27:32 UTC (rev 1780) +++ qa/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java 2005-12-12 15:38:25 UTC (rev 1781) @@ -22,6 +22,8 @@ package org.jboss.forge.status.plugins; +import java.util.Map; + import org.jboss.forge.common.projects.Projects; /** @@ -31,9 +33,11 @@ public abstract class StatusPlugin { protected Projects projects; + protected Map properties; - public void init(Projects projects) { + public void init(Projects projects, Map<String,String> properties) { this.projects = projects; + this.properties = properties; } public abstract String getId(); Modified: qa/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java =================================================================== --- qa/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java 2005-12-12 15:27:32 UTC (rev 1780) +++ qa/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java 2005-12-12 15:38:25 UTC (rev 1781) @@ -22,6 +22,7 @@ package org.jboss.forge.status.plugins.svn; +import org.jboss.forge.common.projects.Projects; import org.jboss.forge.status.plugins.StatusPlugin; import java.net.MalformedURLException; @@ -47,9 +48,8 @@ private Logger log; - private final static String KOSMOS_SVN_SERVICE_URL = - "http://localhost:8080/kosmos-server/kosmos-services/svn-service"; - //TODO shoud be parameter in xml config file + private String serviceURL; + //"http://localhost:8080/kosmos-server/kosmos-services/svn-service"; public SvnStatusPlugin() { super(); @@ -58,6 +58,12 @@ log = Logger.getLogger(this.getClass()); } + public void init(Projects projects, Map<String,String> properties) { + super.init(projects,properties); + serviceURL = properties.get("svn-service"); + System.out.println("service-url " + serviceURL); + } + protected abstract int getPluginSpecyficValue(Map projectMap); protected abstract int getPluginSpecyficDefaultValue(); @@ -78,15 +84,21 @@ SvnService service; try { - service = (SvnService) factory.create(SvnService.class, - KOSMOS_SVN_SERVICE_URL); + service = (SvnService) factory.create(SvnService.class, serviceURL); } catch (MalformedURLException e) { - log.error("Can not connect to kosmos svn service: " + KOSMOS_SVN_SERVICE_URL); + log.error("Can not connect to kosmos svn service: " + serviceURL); return null; } // Get repository map - List repositories = service.getRepositories(repoURL); + List repositories = null; + try { + repositories = service.getRepositories(repoURL); + } catch (Exception e) { + log.error("Can not analyze repo: " + repoURL, e); + return null; + } + repositoryMap = (Map) repositories.get(0); //printRepo(repositoryMap); Modified: qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java =================================================================== --- qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java 2005-12-12 15:27:32 UTC (rev 1780) +++ qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java 2005-12-12 15:38:25 UTC (rev 1781) @@ -82,7 +82,7 @@ private File pageDictionaryFile; private WikiEngine wikiEngine; - + private Logger log; public void setWikiEngine(WikiEngine wikiEngine) { @@ -91,7 +91,7 @@ public FileDataSource() { log = Logger.getLogger(FileDataSource.class); - + log.info("Looking for props file !"); Properties fileDSProps = new Properties(); @@ -102,21 +102,20 @@ .getResourceAsStream(propFileName)); } catch (IOException ioe) { - log.error("Can't load the file " + propFileName + "\n" - , ioe); + log.error("Can't load the file " + propFileName + "\n", ioe); } loadProperties(fileDSProps); File mainWikiDir = new File(pathToMedia); File attWikiDir = new File(pathToAttachments); - + if (!mainWikiDir.exists()) mainWikiDir.mkdirs(); - + if (!attWikiDir.exists()) attWikiDir.mkdirs(); - + pageModProps = new Properties(); modFile = new File(pathToMedia + "/" + propModFileName); @@ -132,13 +131,12 @@ pageModProps.load(fis); } catch (IOException ioe) { - log.error("Can't load the file " + propModFileName + "\n" - , ioe); + log.error("Can't load the file " + propModFileName + "\n", ioe); } finally { try { fis.close(); } catch (IOException ioe) { - log.error("Can't close input stream \n" , ioe); + log.error("Can't close input stream \n", ioe); } } @@ -174,7 +172,7 @@ try { pageDictionaryFile.createNewFile(); } catch (IOException e) { - log.error("Cannot create dictionary file: ",e); + log.error("Cannot create dictionary file: ", e); } } else { // there is dictionary file. Load props from it @@ -250,10 +248,9 @@ } log.info("Opening files"); - File pageFile = new File(pathToMedia + "/OLD/" + uid - + "/" + (page.getLastVersion() - 1) + ".txt"); - File pageOldFile = new File(pathToMedia + "/" + uid - + ".txt"); + File pageFile = new File(pathToMedia + "/OLD/" + uid + "/" + + (page.getLastVersion() - 1) + ".txt"); + File pageOldFile = new File(pathToMedia + "/" + uid + ".txt"); FileOutputStream pageFileWriter; FileInputStream pageFileReader; @@ -285,11 +282,9 @@ pageFileWriter.close(); status = true; } catch (FileNotFoundException fnfe) { - log.error("[FILEDATASOURCE]: Cannot save page: " - , fnfe); + log.error("[FILEDATASOURCE]: Cannot save page: ", fnfe); } catch (IOException ioe) { - log.error("[FILEDATASOURCE]: Cannot save page: " - , ioe); + log.error("[FILEDATASOURCE]: Cannot save page: ", ioe); } } else { // there is no page on disk. We have to create new one. @@ -297,8 +292,7 @@ try { // create needed dirs - File newPageFile = new File(pathToMedia + "/OLD/" - + uid); + File newPageFile = new File(pathToMedia + "/OLD/" + uid); newPageFile.mkdirs(); // write the page @@ -388,8 +382,9 @@ } } catch (IOException e) { - log.error("Cannot create page props file for page: " - + pageName,e); + log.error( + "Cannot create page props file for page: " + pageName, + e); } return pageProps; } @@ -448,33 +443,34 @@ } } - - public void saveRolesSet(String uid, Set<String> roles, int action) throws DataSourceException { + + public void saveRolesSet(String uid, Set<String> roles, int action) + throws DataSourceException { File rolesFile; try { rolesFile = getRolesFile(uid, action); - + if (rolesFile == null) throw new DataSourceException("Wrong action number"); - + } catch (IOException e) { throw new DataSourceException(e); } - + FileOutputStream fos = null; try { fos = new FileOutputStream(rolesFile); - + Properties roleProps = new Properties(); - + int i = 1; - + for (String roleName : roles) { - roleProps.setProperty("Role."+i++, roleName); + roleProps.setProperty("Role." + i++, roleName); } - + roleProps.store(fos, SAVE_COMMENT); - + fos.close(); } catch (FileNotFoundException e) { throw new DataSourceException(e); @@ -486,47 +482,49 @@ } throw new DataSourceException(e); } - + } - + private File getRolesFile(String uid, int action) throws IOException { - String fileName = (action == MediaDataSource.EDITABLE) ? "editRoles" : (action == MediaDataSource.VIEWABLE) ? "viewRoles" : null; - + String fileName = (action == MediaDataSource.EDITABLE) ? "editRoles" + : (action == MediaDataSource.VIEWABLE) ? "viewRoles" : null; + if (fileName == null) return null; - - File rolesFile = new File(pathToMedia + "/OLD/" + uid + "/" + fileName + ".properties"); - + + File rolesFile = new File(pathToMedia + "/OLD/" + uid + "/" + fileName + + ".properties"); + if (!rolesFile.exists()) { rolesFile.createNewFile(); } - + return rolesFile; } - + private Set<String> getRoles(String uid, int action) throws IOException { Set<String> set = new TreeSet<String>(); - + File rolesFile = getRolesFile(uid, action); - + if (rolesFile == null) return null; - + FileInputStream rolesFileIs = new FileInputStream(rolesFile); - + Properties roleProps = new Properties(); - + roleProps.load(rolesFileIs); - + int i = 1; - - while (roleProps.getProperty("Role."+i) != null) { - set.add(roleProps.getProperty("Role."+i)); + + while (roleProps.getProperty("Role." + i) != null) { + set.add(roleProps.getProperty("Role." + i)); i++; } - + rolesFileIs.close(); - + return set; } @@ -577,20 +575,26 @@ (pageMods & EDITABLE) == EDITABLE); page.setLength(pageFile.length()); - + try { page.setEditRoles(getRoles(pageName, EDITABLE)); } catch (IOException e) { - log.error("Couldn't read edit roles for page: "+pageName, e); + log.error("Couldn't read edit roles for page: " + pageName, + e); } try { page.setViewRoles(getRoles(pageName, VIEWABLE)); } catch (IOException e) { - log.error("Couldn't read view roles for page: "+pageName, e); + log.error("Couldn't read view roles for page: " + pageName, + e); } } } + // get Metadata props. + if (page != null) // page exists at all + page.setMetaDataProps(getMetadataProps(pageName)); + return page; } @@ -601,7 +605,8 @@ public WikiPage getPage(String pageName, String languageCode) { if (languageCode != null) { - log.info("As for now, languages aren't supported in the wiki. Please do not use language codes"); + log + .info("As for now, languages aren't supported in the wiki. Please do not use language codes"); } return getPage(pageName); } @@ -609,7 +614,8 @@ public WikiPage getPageAtVersion(WikiPage originPage, boolean loadContent, String languageCode, int version) { if (languageCode != null) { - log.info("As for now, languages aren't supported in the wiki. Please do not use language codes"); + log + .info("As for now, languages aren't supported in the wiki. Please do not use language codes"); } return getPageAtVersion(originPage, loadContent, version); @@ -633,8 +639,8 @@ if (page != null) { if (page.getLastVersion() < version) { - log.info("There is no version " + version - + " of page " + page.getName()); + log.info("There is no version " + version + " of page " + + page.getName()); return null; } @@ -651,8 +657,8 @@ /* * cal.setTime(new Date()); * - * log.info("PAGE "+page.getName()+" loaded in: - * "+(cal.getTimeInMillis() - oldMilis)); + * log.info("PAGE "+page.getName()+" loaded in: "+(cal.getTimeInMillis() - + * oldMilis)); */ return page; } @@ -717,8 +723,8 @@ } } - public void addAttachment(InputStream attFile, String attName, WikiPage page, - String user) { + public void addAttachment(InputStream attFile, String attName, + WikiPage page, String user) { String pageName = page.getName(); Properties attProps = getAttProps(pageName, attName, true); @@ -880,15 +886,13 @@ FileInputStream fis; try { fis = new FileInputStream(file); - return new WikiAttachment(attachementName, - new Date(file.lastModified()), user, file.length(), fis, - version); + return new WikiAttachment(attachementName, new Date(file + .lastModified()), user, file.length(), fis, version); } catch (FileNotFoundException e) { e.printStackTrace(); return null; } - - + } public int getLastAttachmentVersion(String pageName, String attachementName) { @@ -973,12 +977,12 @@ fos = new FileOutputStream(modFile); pageModProps.store(fos, SAVE_COMMENT); } catch (IOException ioe) { - log.error("Couldn't store mod props: ",ioe); + log.error("Couldn't store mod props: ", ioe); } finally { try { fos.close(); } catch (IOException ioe) { - log.error("Can't close input stream \n",ioe); + log.error("Can't close input stream \n", ioe); } } } @@ -1106,8 +1110,8 @@ } if (!attFile.renameTo(attTrashFile)) { - log.error("[ATTACHMENT DS]:Problems with moving " - + attName + " to " + attTrashName); + log.error("[ATTACHMENT DS]:Problems with moving " + attName + + " to " + attTrashName); return false; } @@ -1148,8 +1152,8 @@ } if (!attFile.renameTo(new File(attTrashName))) { - log.error("[ATTACHMENT DS]:Problems with moving " - + attName + " to " + attTrashName); + log.error("[ATTACHMENT DS]:Problems with moving " + attName + + " to " + attTrashName); return false; } @@ -1179,14 +1183,14 @@ public synchronized void rename(String uid, String newName) throws PageRenamingException { - + if (wikiEngine.pageExists(newName)) { throw new PageRenamingException( "Page with the name you're trying rename to already exists."); } - + lock = true; - + pageDictionary.setProperty(uid, newName); pageRevDictionary.setProperty(newName, uid); @@ -1194,7 +1198,7 @@ // find apropriate uid int i = 2; - + while ((pageExists(uid + String.valueOf(i))) || (pageDictionary.containsKey(uid + String.valueOf(i)))) { log.info(i++); @@ -1203,11 +1207,11 @@ // add maping for new (to be done) with name translated to old uid pageDictionary.setProperty(uid + String.valueOf(i), uid); pageRevDictionary.setProperty(uid, uid + String.valueOf(i)); - + saveDictionary(); - log.info("Renamed (uid) "+uid+" to "+newName); - + log.info("Renamed (uid) " + uid + " to " + newName); + lock = false; } @@ -1242,7 +1246,8 @@ return pageRevDictionary.contains(realName); } - public synchronized void removeDictForPage(String uid) throws PageRenamingException { + public synchronized void removeDictForPage(String uid) + throws PageRenamingException { if (!pageDictionary.contains(uid)) { throw new PageRenamingException( "There is no dictionary entry for uid: " + uid); @@ -1253,7 +1258,78 @@ // remove all dict entries pageDictionary.remove(uid); pageRevDictionary.remove(realName); - + saveDictionary(); } + + public Properties getMetadataProps(String uid) { + + if (!pageExists(uid)) { + // don't get matedata props for nonexisting page + return new Properties(); + } + + File propsFile = new File(pathToMedia + "/OLD/" + uid + + "/metadata.properties"); + + if (!propsFile.exists()) { + + // create file if it doesn't exist yet + try { + propsFile.createNewFile(); + } catch (IOException e) { + log.error(e); + } + } + + Properties props = new Properties(); + FileInputStream fis = null; + + try { + fis = new FileInputStream(propsFile); + } catch (FileNotFoundException e1) { + log.error(e1); + } + + try { + props.load(fis); + } catch (IOException e) { + log.error(e); + } + + try { + fis.close(); + } catch (IOException e) { + log.error(e); + } + + return props; + } + + public void saveMetadataProps(String uid, Properties props) { + getMetadataProps(uid); //this will create file if needed. + + File propsFile = new File(pathToMedia + "/OLD/" + uid + + "/metadata.properties"); + + FileOutputStream fos = null; + + try { + fos = new FileOutputStream(propsFile); + } catch (FileNotFoundException e) { + log.error(e); + } + + try { + props.store(fos, SAVE_COMMENT); + } catch (IOException e) { + log.error(e); + } + + try { + fos.close(); + } catch (IOException e) { + log.error(e); + } + } } Modified: qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/MediaDataSource.java =================================================================== --- qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/MediaDataSource.java 2005-12-12 15:27:32 UTC (rev 1780) +++ qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/MediaDataSource.java 2005-12-12 15:38:25 UTC (rev 1781) @@ -21,6 +21,8 @@ */ package org.jboss.wiki; +import java.util.HashMap; +import java.util.Properties; import java.util.Set; import org.jboss.wiki.exceptions.DataSourceException; @@ -214,4 +216,16 @@ * @param action can be MediaDataSource.EDITABLE or MediaDataSource.VIEWABLE */ public void saveRolesSet(String uid, Set<String> roles, int action) throws DataSourceException; + + /**Save metadata properties for given page. + * @param uid Page uid to save properties to. + */ + public void saveMetadataProps(String uid, Properties props); + + /**Gets metadata properties for given page. + * @param uid Page uid to get properties for. + * @return + */ + public Properties getMetadataProps(String uid); + } Modified: qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuDataSource.java =================================================================== --- qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuDataSource.java 2005-12-12 15:27:32 UTC (rev 1780) +++ qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuDataSource.java 2005-12-12 15:38:25 UTC (rev 1781) @@ -1529,4 +1529,15 @@ // TODO Auto-generated method stub } + + public void saveMetadataProps(String uid, Properties props) { + // TODO Auto-generated method stub + + } + + public Properties getMetadataProps(String uid) { + // TODO Auto-generated method stub + return null; + } + } Modified: qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPage.java =================================================================== --- qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPage.java 2005-12-12 15:27:32 UTC (rev 1780) +++ qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPage.java 2005-12-12 15:38:25 UTC (rev 1781) @@ -27,6 +27,7 @@ import java.util.Date; import java.util.HashMap; import java.util.HashSet; +import java.util.Properties; import java.util.Set; import java.util.TreeSet; @@ -49,6 +50,7 @@ */ public class WikiPage implements Serializable, WikiProperties, Cloneable { + public static final String METADATA = "MetaData:Properties"; /** * */ @@ -88,21 +90,6 @@ private Logger log; - /** - * <p> - * Represents ... - * </p> - * - * WikiPage This class is _abstract_ and has to be extended by the class - * that we're willing to show our content - * - * functions to be extended: WikiPage(...) - constructor getAttributes() - - * gets set of atributes to be send to the appropriate JSP page - * saveThisPage(data:Object) - saves next version of this page with new data - * getJSPPath() - gets apropriate JSP page to show plugin - * getDataProviderName - gets name of the plugin _must_ be the same as in - * the plugin name in plugin.xml - */ private Credentials lastAuthor; /** @@ -539,7 +526,10 @@ } public void addPermVariable(String key, Object value) { - permVariables.put(key, value); + //TODO - cannot add METADATA property - tho must be thrown an Exception or sth. + if (!key.equals(WikiPage.METADATA)) { + permVariables.put(key, value); + } } public Object getPermVariable(String key) { @@ -623,4 +613,11 @@ public void setTempVariables(HashMap<String, Object> tempVariables) { this.tempVariables = tempVariables; } + + /**Has to be executed explicitely - so user knows he IS changing metaProps + * @param metaProps + */ + public void setMetaDataProps(Properties metaProps) { + permVariables.put(METADATA, metaProps); + } } Modified: qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/GetRefsFromPagePlugin.java =================================================================== --- qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/GetRefsFromPagePlugin.java 2005-12-12 15:27:32 UTC (rev 1780) +++ qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/GetRefsFromPagePlugin.java 2005-12-12 15:38:25 UTC (rev 1781) @@ -49,13 +49,10 @@ pageUid = pageUid.substring(1, pageUid.indexOf(']')); - if (!HTMLTranslatorParts.checkImageLink(pageUid) && !HTMLTranslatorParts.isExternalLink(pageUid) && !HTMLTranslatorParts.isNumber(pageUid)) { - pageUid = HTMLTranslatorParts.cleanLink(pageUid); - - if (pageUid != null && !HTMLTranslatorParts.isNumber(pageUid) ) { - refs.add(wikiEngine.getRealName(pageUid)); - } - } + pageUid = checkRef(pageUid); + + if (pageUid != null) + refs.add(wikiEngine.getRealName(pageUid)); } matcher = Pattern.compile(pattern2).matcher(pageContent); @@ -67,16 +64,28 @@ pageUid = pageUid.substring(pageUid.indexOf('|') + 1, pageUid .indexOf(']')); - if (!HTMLTranslatorParts.checkImageLink(pageUid) && !HTMLTranslatorParts.isExternalLink(pageUid) && !HTMLTranslatorParts.isNumber(pageUid)) { - pageUid = HTMLTranslatorParts.cleanLink(pageUid); - - if (pageUid != null && !HTMLTranslatorParts.isNumber(pageUid)) { - refs.add(wikiEngine.getRealName(pageUid)); - } - } + pageUid = checkRef(pageUid); + + if (pageUid != null) + refs.add(wikiEngine.getRealName(pageUid)); } return refs; } + + private String checkRef(String pageUid) { + + pageUid = pageUid.trim(); + + if (!HTMLTranslatorParts.checkImageLink(pageUid) && !HTMLTranslatorParts.isExternalLink(pageUid) && !HTMLTranslatorParts.isNumber(pageUid)) { + pageUid = HTMLTranslatorParts.cleanLink(pageUid); + if (pageUid != null && !HTMLTranslatorParts.isNumber(pageUid)) { + return pageUid; + } + } + + return null; + } + } Modified: qa/forge/portal-extensions/jbosswiki/wiki-management/src/java/org/jboss/wiki/management/WikiService.java =================================================================== --- qa/forge/portal-extensions/jbosswiki/wiki-management/src/java/org/jboss/wiki/management/WikiService.java 2005-12-12 15:27:32 UTC (rev 1780) +++ qa/forge/portal-extensions/jbosswiki/wiki-management/src/java/org/jboss/wiki/management/WikiService.java 2005-12-12 15:38:25 UTC (rev 1781) @@ -23,6 +23,7 @@ import javax.ejb.Local; import javax.ejb.Remote; + import org.jboss.annotation.ejb.Management; import org.jboss.annotation.ejb.Service; import org.jboss.logging.Logger; @@ -30,15 +31,17 @@ import org.jboss.wiki.WikiEngine; import org.jboss.wiki.management.WikiServiceMenagement; -@Service (objectName = WikiCommon.WIKI_SERVICE_NAME) +@Service(objectName = WikiCommon.WIKI_SERVICE_NAME) @Local(WikiServiceLocal.class) @Remote(WikiServiceRemote.class) @Management(WikiServiceMenagement.class) - public class WikiService implements WikiServiceLocal, WikiServiceRemote, WikiServiceMenagement { - +public class WikiService implements WikiServiceLocal, WikiServiceRemote, + WikiServiceMenagement { + private WikiEngine wikiEngine; + private Logger log = Logger.getLogger(WikiService.class); - + public synchronized WikiEngine getWikiEngine() { if (wikiEngine == null) { wikiEngine = new WikiEngine(); @@ -61,6 +64,5 @@ public void destroy() { log.info("WikiService - Destroying"); } - - + } |
|
From: <jbo...@li...> - 2005-12-12 15:27:47
|
Author: rl...@jb...
Date: 2005-12-12 10:27:32 -0500 (Mon, 12 Dec 2005)
New Revision: 1780
Removed:
trunk/labs/jbossbuild/projects/jboss/aop/jboss-5.0-SNAPSHOT/
Modified:
trunk/labs/jbossbuild/projects/jboss/aop/pom.xml
Log:
cleanup
Modified: trunk/labs/jbossbuild/projects/jboss/aop/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/aop/pom.xml 2005-12-12 14:57:08 UTC (rev 1779)
+++ trunk/labs/jbossbuild/projects/jboss/aop/pom.xml 2005-12-12 15:27:32 UTC (rev 1780)
@@ -90,7 +90,7 @@
<dependency>
<groupId>trove</groupId>
<artifactId>trove</artifactId>
- <version>1.0.2</version>
+ <version>2.1.1</version>
</dependency>
<dependency>
<groupId>org.jboss.server.common</groupId>
|
|
From: <jbo...@li...> - 2005-12-12 14:57:18
|
Author: aron.gombas
Date: 2005-12-12 09:57:08 -0500 (Mon, 12 Dec 2005)
New Revision: 1779
Modified:
trunk/labs/kosmos/src/java/hu/midori/kosmos/server/CachedDataStore.java
Log:
Extended store interface
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/CachedDataStore.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/CachedDataStore.java 2005-12-12 14:37:08 UTC (rev 1778)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/CachedDataStore.java 2005-12-12 14:57:08 UTC (rev 1779)
@@ -17,9 +17,13 @@
* @version $Id$
*/
public interface CachedDataStore {
+ /** TODO */
+ // public void begin();
/**
* Stores the passed stream to an implementation-dependent "storage".
* @return the absolute URL that points to the resulted file.
*/
- public String storeFile(String fileName, InputStream in) throws Exception;
+ public String storeFile(String fileName, InputStream in) throws Exception;// TODO rename "store"
+ /** TODO */
+ //public void end();
}
|
|
From: <jbo...@li...> - 2005-12-12 14:37:13
|
Author: dam...@jb... Date: 2005-12-12 09:37:08 -0500 (Mon, 12 Dec 2005) New Revision: 1778 Added: trunk/labs/jbosstm/ Log: Added jbosstm. |
550 messages has been excluded from this view by a project administrator.
