jboss-svn-commits — JBoss SVN commit notifications

[Jboss-svn-commits] JBL Code SVN: r968 - in trunk/forge/portal-extensions: . forge-jspwiki forge-wiki/src/etc/org/jboss/wiki forge-wiki/src/java/org/jboss/wiki/plugins jspwiki

[<jbo...@li...>]

Author: szimano
Date: 2005-08-26 06:52:10 -0400 (Fri, 26 Aug 2005)
New Revision: 968

Modified:
   trunk/forge/portal-extensions/forge-jspwiki/maven.xml
   trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java
   trunk/forge/portal-extensions/jspwiki/maven.xml
   trunk/forge/portal-extensions/maven.xml
Log:
bugs, trail n find results etc.


Modified: trunk/forge/portal-extensions/forge-jspwiki/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-jspwiki/maven.xml	2005-08-26 10:22:06 UTC (rev 967)
+++ trunk/forge/portal-extensions/forge-jspwiki/maven.xml	2005-08-26 10:52:10 UTC (rev 968)
@@ -9,15 +9,15 @@
     </goal>
 
     <goal name="build">
-	<attainGoal name="copy-tld" />
-        <attainGoal name="war" />
+	<!--<attainGoal name="copy-tld" />
+        <attainGoal name="war" />-->
     </goal>
     
     <goal name="deploy">
-	<ant:copy todir="${local.deploy.dir}" flatten="true">
+	<!--<ant:copy todir="${local.deploy.dir}" flatten="true">
 	    <ant:fileset dir=".">
 		<ant:filename name="target/*.war" />
 	    </ant:fileset>
-	</ant:copy>
+	</ant:copy>-->
     </goal>
 </project>

Modified: trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml	2005-08-26 10:22:06 UTC (rev 967)
+++ trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml	2005-08-26 10:52:10 UTC (rev 968)
@@ -41,6 +41,10 @@
 			<class>org.jboss.wiki.plugins.FindResultPlugin</class>
 		</plugin>
 		<plugin>
+			<name>trail</name>
+			<class>org.jboss.wiki.plugins.TrailPlugin</class>
+		</plugin>
+		<plugin>
 			<name>wikiToHtmlTranslator</name>
 			<class>org.jboss.wiki.plugins.HTMLTranslator</class>
 		</plugin>

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java	2005-08-26 10:22:06 UTC (rev 967)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java	2005-08-26 10:52:10 UTC (rev 968)
@@ -931,6 +931,7 @@
 		
 		portalHome = (String)wikiSession.getAttribute("hostURL")+(String)wikiSession.getAttribute("actionURL");
 		wikiHome = "";
+		imagePath = (String)wikiSession.getAttribute("hostURL") + "/wiki";
 		
 		try {
 			newPage = (WikiPage) wikiPage.clone();

Modified: trunk/forge/portal-extensions/jspwiki/maven.xml
===================================================================
--- trunk/forge/portal-extensions/jspwiki/maven.xml	2005-08-26 10:22:06 UTC (rev 967)
+++ trunk/forge/portal-extensions/jspwiki/maven.xml	2005-08-26 10:52:10 UTC (rev 968)
@@ -5,20 +5,20 @@
  -->
 <project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
     <goal name="build">
-	<ant:ant dir="${basedir}" antfile="build.xml" target="war" />
+	<!--<ant:ant dir="${basedir}" antfile="build.xml" target="war" />-->
     </goal>
     
     <goal name="deploy">
-	<ant:copy todir="${local.deploy.dir}" flatten="true">
+	<!--<ant:copy todir="${local.deploy.dir}" flatten="true">
 	    <ant:fileset dir=".">
 		<ant:filename name="releases/*.war" />
 	    </ant:fileset>
-	</ant:copy>
+	</ant:copy>-->
     </goal>
     
     <goal name="prj-install">
-	<ant:copy todir="${local.deploy.dir}/../.." overwrite="no">
+	<!--<ant:copy todir="${local.deploy.dir}/../.." overwrite="no">
 	    <ant:fileset dir="to-copy" />
-	</ant:copy>
+	</ant:copy>-->
     </goal>
 </project>

Modified: trunk/forge/portal-extensions/maven.xml
===================================================================
--- trunk/forge/portal-extensions/maven.xml	2005-08-26 10:22:06 UTC (rev 967)
+++ trunk/forge/portal-extensions/maven.xml	2005-08-26 10:52:10 UTC (rev 968)
@@ -116,7 +116,6 @@
 3. blojsom/to-copy/blojsom.war/WEB-INF/blojsom.properties
 4. forge-login/to-copy/portal-login-ds.xml
 5. federation-register/src/web/WEB-INF/faces-config (only for the JOSF portal).
-6. forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample (change htmlTranslatorURL to your url)
 
 Available goals:
 - help - prints this info

[Jboss-svn-commits] JBL Code SVN: r967 - in trunk/forge/portal-extensions/forge-wiki/src: etc/org/jboss/wiki java/org/jboss/wiki java/org/jboss/wiki/fileaccess java/org/jboss/wiki/plugins

[<jbo...@li...>]

Author: szimano
Date: 2005-08-26 06:22:06 -0400 (Fri, 26 Aug 2005)
New Revision: 967

Added:
   trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties
Removed:
   trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/SecureLinksPlugin.java
Modified:
   trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java
Log:
no host in properties... *nice*


Modified: trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml	2005-08-25 21:12:14 UTC (rev 966)
+++ trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml	2005-08-26 10:22:06 UTC (rev 967)
@@ -24,10 +24,6 @@
 			<name>friendlyLinks</name>
 			<class>org.jboss.wiki.plugins.FriendlyLinkPlugin</class>
 		</plugin>
-		<plugin>
-			<name>secureLinks</name>
-			<class>org.jboss.wiki.plugins.SecureLinksPlugin</class>
-		</plugin>
 	</wikiType>
 	<wikiType>
 		<name>DIFF</name>
@@ -36,10 +32,6 @@
 			<name>Diff</name>
 			<class>org.jboss.wiki.plugins.DiffPlugin</class>
 		</plugin>
-		<plugin>
-			<name>secureLinks</name>
-			<class>org.jboss.wiki.plugins.SecureLinksPlugin</class>
-		</plugin>
 	</wikiType>
 	<wikiType>
 		<name>FIND</name>
@@ -52,9 +44,5 @@
 			<name>wikiToHtmlTranslator</name>
 			<class>org.jboss.wiki.plugins.HTMLTranslator</class>
 		</plugin>
-		<plugin>
-			<name>secureLinks</name>
-			<class>org.jboss.wiki.plugins.SecureLinksPlugin</class>
-		</plugin>
 	</wikiType>
 </wikiTypes>
\ No newline at end of file

Added: trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties	2005-08-25 21:12:14 UTC (rev 966)
+++ trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties	2005-08-26 10:22:06 UTC (rev 967)
@@ -0,0 +1,7 @@
+# WikiPlugin properties. Use it wise.
+
+#extensions for images to be inlined, coma-separated
+imagePatterns = .png , .jpeg , .gif , .bmp 
+
+#wikiHome part of url. Leave it you use default portlet conifguration
+wikiHome = /portal/index.html?ctrl:id=window.default.WikiPortletWindow&ctrl:type=action

Deleted: trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample	2005-08-25 21:12:14 UTC (rev 966)
+++ trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample	2005-08-26 10:22:06 UTC (rev 967)
@@ -1,24 +0,0 @@
-# WikiPlugin properties. Use it wise.
-#specifies base URL for the portal
-htmlTranslatorURL = http://forge.sicore.org:8080/
-#htmlTranslatorURL = http://localhost:8080/
-
-#extensions for images to be inlined, coma-separated
-imagePatterns = .png , .jpeg , .gif , .bmp 
-
-#wikiHome part of url. Leave it you use default portlet conifguration
-wikiHome = index.html?ctrl:id=window.default.WikiPortletWindow&ctrl:type=action
-
-#Replaces for secure connection (of urls):
-
-#all are coma separated
-
-#sslReplaces - replace all the links SecureLinksPlugin.
-#First one is regex for finding a region to replace in
-#then are pairs of: regex(what replace), String(replacement)
-#Be carefull with white charachters as they count also (same with sslRedirectReplaces)
-sslReplaces=<a href=\"http.+:8080.+>.+</a>,http,https,:8080,:8443
-
-#sslRedirectReplaces used by redirector
-#pairs of: regex(what replace), String(replacement)
-sslRedirectReplaces=http,https,:8080,:8443
\ No newline at end of file

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java	2005-08-25 21:12:14 UTC (rev 966)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java	2005-08-26 10:22:06 UTC (rev 967)
@@ -44,7 +44,7 @@
 	}
 
 	public void processAction(JBossActionRequest rReq, JBossActionResponse rResp) {
-
+		
 		// wikiContext is null - to get refernece to actual page
 
 		WikiContext wikiContext = null;
@@ -197,6 +197,16 @@
 	public void doView(JBossRenderRequest rReq, JBossRenderResponse rRes)
 			throws PortletException, java.io.IOException {
 
+		PortletURL wikiURL = rRes.createActionURL();
+
+		rReq.setAttribute("actionURL", wikiURL.toString());
+
+		// Create server host and put it into session for plugins
+		String hostURL = ((rReq.isSecure()) ? "https" : "http") + "://"+rReq.getServerName()+((rReq.getServerPort() == 80) ? "" : ":"+ rReq.getServerPort());
+		
+		rReq.getPortletSession().setAttribute("hostURL", hostURL);
+		rReq.getPortletSession().setAttribute("actionURL", wikiURL.toString());
+		
 		rReq.getPortletSession().setAttribute("isSecure",
 				new Boolean(rReq.isSecure()));
 
@@ -328,11 +338,7 @@
 			}
 
 		}
-
-		PortletURL wikiURL = rRes.createActionURL();
-
-		rReq.setAttribute("actionURL", wikiURL.toString());
-
+		
 		rReq
 				.setAttribute(
 						"wikiName",
@@ -353,7 +359,7 @@
 
 		// FIXME make this more elegant (ie. plugin)
 		// pass friendly link
-		Properties props = new Properties();
+		/*Properties props = new Properties();
 		props.load(WikiPlugin.class
 				.getResourceAsStream("wikiPlugins.properties"));
 		String href = props.getProperty("htmlTranslatorURL") + "wiki/"
@@ -364,9 +370,9 @@
 			// chage normal url to secure
 			for (int i = 0; i < replaces.length; i += 2)
 				href = href.replaceAll(replaces[i], replaces[i + 1]);
-		}
+		}*/
 
-		rReq.setAttribute("friendlyLink", href);
+		rReq.setAttribute("friendlyLink", hostURL+"/wiki/"+pageToShow.getName());
 
 		rRes.setTitle("Wiki");
 		if (javax.portlet.WindowState.NORMAL.equals(rReq.getWindowState())

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java	2005-08-25 21:12:14 UTC (rev 966)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java	2005-08-26 10:22:06 UTC (rev 967)
@@ -46,7 +46,7 @@
 
 	private String attachementsPath;
 
-	private String host;
+	private String wikiHome;
 	
 	private String[] replaces;
 
@@ -76,11 +76,7 @@
 					.getResourceAsStream("wikiPlugins.properties"));
 
 			// get the host
-			host = props.getProperty("htmlTranslatorURL") + "portal/"
-					+ props.getProperty("wikiHome");
-
-			// get ssl replaces
-			replaces = props.getProperty("sslRedirectReplaces").split(",");
+			wikiHome = props.getProperty("wikiHome");
 			
 		} catch (IOException e) {
 			System.err.println(e);
@@ -105,20 +101,10 @@
 			System.out.println("length " + tokens.length);
 
 			if (tokens.length == 3) {
-				String newHost = host;
+				String hostURL = ((request.isSecure()) ? "https" : "http") + "://"+request.getServerName()+((request.getServerPort() == 80) ? "" : ":"+ request.getServerPort());
 				
-				if ((request.isSecure())&&(replaces.length % 2 == 0)) {
-					for (int i = 0; i < replaces.length; i+= 2)
-						newHost = newHost.replaceAll(
-								replaces[i], replaces[i+1]);
-				}
-				
-				// show page (redirect)
-				System.out.println("redirecting: " + newHost + "&page="
+				httpResponse.sendRedirect(hostURL+wikiHome + "&page="
 						+ tokens[tokens.length - 1]);
-
-				httpResponse.sendRedirect(newHost + "&page="
-						+ tokens[tokens.length - 1]);
 			} else {
 				// get fileName of attachement and page which is connected to
 				String fileName = tokens[tokens.length - 1];

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java	2005-08-25 21:12:14 UTC (rev 966)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java	2005-08-26 10:22:06 UTC (rev 967)
@@ -21,8 +21,10 @@
 	
 	@Override
 	public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) {
+		host = (String)wikiSession.getAttribute("hostURL")+"/wiki/";
+		
 		WikiPage newPage = null;
-
+		
 		try {
 			newPage = (WikiPage) wikiPage.clone();
 		} catch (CloneNotSupportedException cl) {
@@ -50,7 +52,7 @@
 
 	@Override
 	public void init() {
-		host = getProperty("htmlTranslatorURL")+"wiki/";
+		
 	}
 
 }

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java	2005-08-25 21:12:14 UTC (rev 966)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java	2005-08-26 10:22:06 UTC (rev 967)
@@ -37,6 +37,12 @@
 	
 	@Override
 	public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) {
+		url = (String)wikiSession.getAttribute("hostURL")+"/wiki/";
+		
+		pattern = "<a href=\""+(((String)wikiSession.getAttribute("hostURL")+(String)wikiSession.getAttribute("actionURL")).replaceAll("\\.","\\\\.").replaceAll("\\?", "\\\\?"))+"&page=\\w+\">";
+		
+		System.out.println(pattern);
+		
 		WikiPage newPage = null;
 
 		try {
@@ -52,11 +58,7 @@
 
 	@Override
 	public void init() {
-		url = getProperty("htmlTranslatorURL")+"wiki/";
 		
-		pattern = "<a href=\""+((getProperty("htmlTranslatorURL")+"portal/"+getProperty("wikiHome")).replaceAll("\\.","\\\\.").replaceAll("\\?", "\\\\?"))+"&page=\\w+\">";
-		
-		System.out.println(pattern);
 	}
 
 }

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java	2005-08-25 21:12:14 UTC (rev 966)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/HTMLTranslator.java	2005-08-26 10:22:06 UTC (rev 967)
@@ -928,6 +928,10 @@
 
 	public WikiPage process(final WikiPage wikiPage, WikiSession wikiSession) {
 		WikiPage newPage = null;
+		
+		portalHome = (String)wikiSession.getAttribute("hostURL")+(String)wikiSession.getAttribute("actionURL");
+		wikiHome = "";
+		
 		try {
 			newPage = (WikiPage) wikiPage.clone();
 		} catch (CloneNotSupportedException cnse) {
@@ -950,10 +954,10 @@
 
 	@Override
 	public void init() {
-		portalHome = getProperty("htmlTranslatorURL") + "portal/";
+		//portalHome = getProperty("htmlTranslatorURL") + "portal/";
 		mediaPatterns = getProperty("imagePatterns");
-		imagePath = getProperty("htmlTranslatorURL") + "wiki";
-		wikiHome = getProperty("wikiHome");
+		//imagePath = getProperty("htmlTranslatorURL") + "wiki";
+		//wikiHome = getProperty("wikiHome");
 	}
 
 }
\ No newline at end of file

Deleted: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/SecureLinksPlugin.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/SecureLinksPlugin.java	2005-08-25 21:12:14 UTC (rev 966)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/SecureLinksPlugin.java	2005-08-26 10:22:06 UTC (rev 967)
@@ -1,67 +0,0 @@
-package org.jboss.wiki.plugins;
-
-import java.util.Vector;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.jboss.wiki.WikiPage;
-import org.jboss.wiki.WikiPlugin;
-import org.jboss.wiki.WikiSession;
-
-public class SecureLinksPlugin extends WikiPlugin {
-
-	private String[] replaces;
-
-	@Override
-	public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) {
-		WikiPage newPage = null;
-
-		try {
-			newPage = (WikiPage) wikiPage.clone();
-		} catch (CloneNotSupportedException cl) {
-			System.err.println(cl);
-		}
-
-		if ((replaces.length % 2 == 1)
-				&& (((Boolean) wikiSession.getAttribute("isSecure")))) {
-
-			String pageContent = newPage.getPageContent();
-			Vector<String> matches = new Vector<String>();
-
-			// find the area
-			Matcher matcher = Pattern.compile(replaces[0]).matcher(pageContent);
-
-			while (matcher.find()) {
-				// change parts of it
-				String hrefToChange = pageContent.substring(matcher.start(),
-						matcher.end());
-				
-				for (int i = 1; i < replaces.length; i += 2)
-					hrefToChange = hrefToChange.replaceAll(replaces[i], replaces[i + 1]);
-				
-				matches.add(hrefToChange);
-			}
-
-			// replace them in pageContent
-			for (int i = 0; i < matches.size(); i++) {
-				pageContent = pageContent.replaceFirst(replaces[0], matches
-						.get(i));
-			}
-
-			// finnaly set new content
-			newPage.setPageContent(pageContent);
-
-		} else {
-			System.err
-					.println("sslReplaces property is not valid. Number of props must be odd (first one is region to change) !");
-		}
-		return newPage;
-	}
-
-	@Override
-	public void init() {
-		// get the replacemen pairs
-		replaces = getProperty("sslReplaces").split(",");
-	}
-
-}

[Jboss-svn-commits] JBL Code SVN: r966 - in trunk/forge/portal-extensions/forge-wiki/src: etc/org/jboss/wiki java/org/jboss/wiki java/org/jboss/wiki/fileaccess java/org/jboss/wiki/plugins

[<jbo...@li...>]

Author: szimano
Date: 2005-08-25 17:12:14 -0400 (Thu, 25 Aug 2005)
New Revision: 966

Modified:
   trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml
   trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/SecureLinksPlugin.java
Log:
secure connections


Modified: trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml	2005-08-25 19:26:42 UTC (rev 965)
+++ trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml	2005-08-25 21:12:14 UTC (rev 966)
@@ -36,6 +36,10 @@
 			<name>Diff</name>
 			<class>org.jboss.wiki.plugins.DiffPlugin</class>
 		</plugin>
+		<plugin>
+			<name>secureLinks</name>
+			<class>org.jboss.wiki.plugins.SecureLinksPlugin</class>
+		</plugin>
 	</wikiType>
 	<wikiType>
 		<name>FIND</name>
@@ -48,5 +52,9 @@
 			<name>wikiToHtmlTranslator</name>
 			<class>org.jboss.wiki.plugins.HTMLTranslator</class>
 		</plugin>
+		<plugin>
+			<name>secureLinks</name>
+			<class>org.jboss.wiki.plugins.SecureLinksPlugin</class>
+		</plugin>
 	</wikiType>
 </wikiTypes>
\ No newline at end of file

Modified: trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample	2005-08-25 19:26:42 UTC (rev 965)
+++ trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample	2005-08-25 21:12:14 UTC (rev 966)
@@ -2,7 +2,23 @@
 #specifies base URL for the portal
 htmlTranslatorURL = http://forge.sicore.org:8080/
 #htmlTranslatorURL = http://localhost:8080/
+
 #extensions for images to be inlined, coma-separated
 imagePatterns = .png , .jpeg , .gif , .bmp 
+
 #wikiHome part of url. Leave it you use default portlet conifguration
 wikiHome = index.html?ctrl:id=window.default.WikiPortletWindow&ctrl:type=action
+
+#Replaces for secure connection (of urls):
+
+#all are coma separated
+
+#sslReplaces - replace all the links SecureLinksPlugin.
+#First one is regex for finding a region to replace in
+#then are pairs of: regex(what replace), String(replacement)
+#Be carefull with white charachters as they count also (same with sslRedirectReplaces)
+sslReplaces=<a href=\"http.+:8080.+>.+</a>,http,https,:8080,:8443
+
+#sslRedirectReplaces used by redirector
+#pairs of: regex(what replace), String(replacement)
+sslRedirectReplaces=http,https,:8080,:8443
\ No newline at end of file

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java	2005-08-25 19:26:42 UTC (rev 965)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java	2005-08-25 21:12:14 UTC (rev 966)
@@ -73,8 +73,8 @@
 						// write the uploaded file to a new location
 						String fieldName = item.getFieldName();
 						String fileName = item.getName();
-						//String contentType = item.getContentType();
-						//long size = item.getSize();
+						// String contentType = item.getContentType();
+						// long size = item.getSize();
 						/*
 						 * rResp .setRenderParameter("size",
 						 * Long.toString(size));
@@ -116,17 +116,18 @@
 			rResp.setRenderParameter("page", rReq.getParameter("page"));
 
 		}
-		
+
 		if (rReq.getParameter("searchQuery") != null) {
-			//TODO do it man !
-			Set<String> pages = wikiEngine.findPages(rReq.getParameter("searchQuery"));
+			// TODO do it man !
+			Set<String> pages = wikiEngine.findPages(rReq
+					.getParameter("searchQuery"));
 
 			rReq.getPortletSession().setAttribute("findResult", pages);
-			
+
 			// show the results
 			rResp.setRenderParameter("page", "FindResult");
 		}
-		
+
 		if (rReq.getParameter("action") != null) {
 			rResp.setRenderParameter("action", rReq.getParameter("action"));
 		}
@@ -196,8 +197,9 @@
 	public void doView(JBossRenderRequest rReq, JBossRenderResponse rRes)
 			throws PortletException, java.io.IOException {
 
-		rReq.getPortletSession().setAttribute("isSecure", new Boolean(rReq.isSecure()));
-		
+		rReq.getPortletSession().setAttribute("isSecure",
+				new Boolean(rReq.isSecure()));
+
 		WikiPage noSuchPage = new WikiPage("", new Credentials(""),
 				"There is no such page. Click on EDIT to start it.", 0, 0,
 				null, wikiEngine.getMediaDataSource());
@@ -218,7 +220,7 @@
 				&& (rReq.getParameter("action").equals("Attach"))) {
 			rReq.setAttribute("fileAttach", "true");
 		}
-				
+
 		if ((rReq.getParameter("action") != null)
 				&& (rReq.getParameter("action").equals("Edit"))
 				&& (rReq.getUser() != null)) {
@@ -228,15 +230,15 @@
 
 			if (rReq.getParameter("version") != null) {
 				// show previous version of page
-				
+
 				System.out.println("Getting page " + wikiPage + " at version "
 						+ rReq.getParameter("version"));
 				pageToShow = wikiEngine.getByName(wikiPage, null, Integer
 						.valueOf(rReq.getParameter("version")));
-				
+
 				if (pageToShow.getLastVersion() != pageToShow.getVersion()) {
 					rReq.setAttribute("showedVersion", Integer.valueOf(rReq
-						.getParameter("version")));
+							.getParameter("version")));
 				}
 			} else {
 				pageToShow = wikiEngine.getByName(wikiPage, null);
@@ -305,10 +307,10 @@
 						+ rReq.getParameter("version"));
 				pageToShow = wikiEngine.getByName(wikiPage, wikiContext,
 						Integer.valueOf(rReq.getParameter("version")));
-				
+
 				if (pageToShow.getLastVersion() != pageToShow.getVersion()) {
 					rReq.setAttribute("showedVersion", Integer.valueOf(rReq
-						.getParameter("version")));
+							.getParameter("version")));
 				}
 			} else {
 				pageToShow = wikiEngine.getByName(wikiPage, wikiContext);
@@ -330,7 +332,7 @@
 		PortletURL wikiURL = rRes.createActionURL();
 
 		rReq.setAttribute("actionURL", wikiURL.toString());
-		
+
 		rReq
 				.setAttribute(
 						"wikiName",
@@ -346,22 +348,26 @@
 
 		rReq.setAttribute("logedIn", (rReq.getUser() != null) ? "true"
 				: "false");
-		
+
 		rReq.setAttribute("defaultPage", defaultPage);
 
 		// FIXME make this more elegant (ie. plugin)
 		// pass friendly link
 		Properties props = new Properties();
-		props.load(WikiPlugin.class.getResourceAsStream("wikiPlugins.properties"));
-		String href = props.getProperty("htmlTranslatorURL")+"wiki/"+pageToShow.getName();
-		
-		if (rReq.isSecure()) {
-			//change http to https
-			href = href.replaceFirst("http", "https");
+		props.load(WikiPlugin.class
+				.getResourceAsStream("wikiPlugins.properties"));
+		String href = props.getProperty("htmlTranslatorURL") + "wiki/"
+				+ pageToShow.getName();
+		String[] replaces = props.getProperty("sslRedirectReplaces").split(",");
+
+		if (rReq.isSecure() && (replaces.length % 2 == 0)) {
+			// chage normal url to secure
+			for (int i = 0; i < replaces.length; i += 2)
+				href = href.replaceAll(replaces[i], replaces[i + 1]);
 		}
-		
+
 		rReq.setAttribute("friendlyLink", href);
-			
+
 		rRes.setTitle("Wiki");
 		if (javax.portlet.WindowState.NORMAL.equals(rReq.getWindowState())
 				|| javax.portlet.WindowState.MAXIMIZED.equals(rReq

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java	2005-08-25 19:26:42 UTC (rev 965)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java	2005-08-25 21:12:14 UTC (rev 966)
@@ -47,6 +47,8 @@
 	private String attachementsPath;
 
 	private String host;
+	
+	private String[] replaces;
 
 	/*
 	 * private ForgeHelper forgeHelper; private ContentManager contentManager;
@@ -77,6 +79,9 @@
 			host = props.getProperty("htmlTranslatorURL") + "portal/"
 					+ props.getProperty("wikiHome");
 
+			// get ssl replaces
+			replaces = props.getProperty("sslRedirectReplaces").split(",");
+			
 		} catch (IOException e) {
 			System.err.println(e);
 		}
@@ -100,11 +105,19 @@
 			System.out.println("length " + tokens.length);
 
 			if (tokens.length == 3) {
-				// show page
-				System.out.println("redirecting: " + host + "&page="
+				String newHost = host;
+				
+				if ((request.isSecure())&&(replaces.length % 2 == 0)) {
+					for (int i = 0; i < replaces.length; i+= 2)
+						newHost = newHost.replaceAll(
+								replaces[i], replaces[i+1]);
+				}
+				
+				// show page (redirect)
+				System.out.println("redirecting: " + newHost + "&page="
 						+ tokens[tokens.length - 1]);
 
-				httpResponse.sendRedirect(host + "&page="
+				httpResponse.sendRedirect(newHost + "&page="
 						+ tokens[tokens.length - 1]);
 			} else {
 				// get fileName of attachement and page which is connected to
@@ -124,7 +137,7 @@
 					System.err.println(e);
 				}
 
-				// looking for the newst version
+				// looking for the newest version
 				int version = 1;
 
 				while (props.getProperty((version + 1) + ".author") != null) {

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java	2005-08-25 19:26:42 UTC (rev 965)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java	2005-08-25 21:12:14 UTC (rev 966)
@@ -38,7 +38,7 @@
 
 			for (String s : attachements) {
 				String href = host+newPage.getName() + "/" + s;
-				newContent += "<a href='"+href+"'>"+href + "</a><br>\n";
+				newContent += "<a href=\""+href+"\">"+href + "</a><br>\n";
 			}
 
 			newPage.setPageContent(newContent);

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/SecureLinksPlugin.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/SecureLinksPlugin.java	2005-08-25 19:26:42 UTC (rev 965)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/SecureLinksPlugin.java	2005-08-25 21:12:14 UTC (rev 966)
@@ -1,11 +1,17 @@
 package org.jboss.wiki.plugins;
 
+import java.util.Vector;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import org.jboss.wiki.WikiPage;
 import org.jboss.wiki.WikiPlugin;
 import org.jboss.wiki.WikiSession;
 
 public class SecureLinksPlugin extends WikiPlugin {
 
+	private String[] replaces;
+
 	@Override
 	public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) {
 		WikiPage newPage = null;
@@ -16,17 +22,46 @@
 			System.err.println(cl);
 		}
 
-		if (((Boolean)wikiSession.getAttribute("isSecure")) == true) {
-			newPage.setPageContent(newPage.getPageContent().replaceAll(
-					"<a href=\"http", "<a href=\"https"));
+		if ((replaces.length % 2 == 1)
+				&& (((Boolean) wikiSession.getAttribute("isSecure")))) {
+
+			String pageContent = newPage.getPageContent();
+			Vector<String> matches = new Vector<String>();
+
+			// find the area
+			Matcher matcher = Pattern.compile(replaces[0]).matcher(pageContent);
+
+			while (matcher.find()) {
+				// change parts of it
+				String hrefToChange = pageContent.substring(matcher.start(),
+						matcher.end());
+				
+				for (int i = 1; i < replaces.length; i += 2)
+					hrefToChange = hrefToChange.replaceAll(replaces[i], replaces[i + 1]);
+				
+				matches.add(hrefToChange);
+			}
+
+			// replace them in pageContent
+			for (int i = 0; i < matches.size(); i++) {
+				pageContent = pageContent.replaceFirst(replaces[0], matches
+						.get(i));
+			}
+
+			// finnaly set new content
+			newPage.setPageContent(pageContent);
+
+		} else {
+			System.err
+					.println("sslReplaces property is not valid. Number of props must be odd (first one is region to change) !");
 		}
 		return newPage;
 	}
 
 	@Override
 	public void init() {
-		// TODO Auto-generated method stub
-
+		// get the replacemen pairs
+		replaces = getProperty("sslReplaces").split(",");
 	}
 
 }

[Jboss-svn-commits] JBL Code SVN: r965 - in trunk/forge/portal-extensions: forge-prj-docs/src/java/org/jboss/forge/projects/docs forge-prj-freezone/src/java/org/jboss/forge/projects/freezone forge-theme/jbossForgeLayout.war

[<jbo...@li...>]

Author: ral...@jb...
Date: 2005-08-25 15:26:42 -0400 (Thu, 25 Aug 2005)
New Revision: 965

Modified:
   trunk/forge/portal-extensions/forge-prj-docs/src/java/org/jboss/forge/projects/docs/Docs.java
   trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
   trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/common.css
Log:
freezone and CSS update

Modified: trunk/forge/portal-extensions/forge-prj-docs/src/java/org/jboss/forge/projects/docs/Docs.java
===================================================================
--- trunk/forge/portal-extensions/forge-prj-docs/src/java/org/jboss/forge/projects/docs/Docs.java	2005-08-25 19:23:17 UTC (rev 964)
+++ trunk/forge/portal-extensions/forge-prj-docs/src/java/org/jboss/forge/projects/docs/Docs.java	2005-08-25 19:26:42 UTC (rev 965)
@@ -43,7 +43,7 @@
 
     /**
      * In the given content, finds a first string of the form:
-     * ${refName:some-text}, and returns the text inside the reference.
+     * <link ... href=, and returns the text inside the reference.
      * 
      * @param content
      *            String in which to look for the reference.
@@ -78,6 +78,20 @@
         else
             return null;
     }
+    
+    /**
+     * Figures out if a link is an off-site link. This recognizes the most
+     * common protocols by checking how it starts. (clears all white space in
+     * case the link starts with '\n' or [space]
+     * 
+     * @author Janne Jalkanen
+     */
+    private boolean isExternalLink(String link) {
+        link = link.trim();
+        return link.startsWith("http:") || link.startsWith("ftp:")
+                || link.startsWith("https:") || link.startsWith("mailto:")
+                || link.startsWith("news:") || link.startsWith("file:");
+    }
 
     public void doView(JBossRenderRequest request, JBossRenderResponse response)
             throws IOException {
@@ -114,7 +128,8 @@
 
             // Replacing links
             while ((nextRef = findNextReference(pageContent, "link")) != null) {
-                if (nextRef.indexOf("http://") == -1)
+               if(!isExternalLink(nextRef))
+                //if (nextRef.indexOf("http://") == -1)
                     //it would be relative not outside link
                     pageContent = forgeHelper.replace(pageContent, "href="
                             + '"' + nextRef + '"',
@@ -141,7 +156,12 @@
 
             //fix back external links
            
-            while (pageContent.indexOf("$http:") != -1 )
+            while (pageContent.indexOf("$http:") != -1
+                    || pageContent.indexOf("$ftp:") != -1 
+                    || pageContent.indexOf("$https:") != -1
+                    || pageContent.indexOf("$file:") != -1
+                    || pageContent.indexOf("$mailto:") != -1
+                    || pageContent.indexOf("$news:") != -1)
                 {pageContent = forgeHelper.replace(pageContent, "$",
                         " href=" + '"');}
             //fix back image links

Modified: trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
===================================================================
--- trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java	2005-08-25 19:23:17 UTC (rev 964)
+++ trunk/forge/portal-extensions/forge-prj-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java	2005-08-25 19:26:42 UTC (rev 965)
@@ -41,7 +41,7 @@
 
     /**
      * In the given content, finds a first string of the form:
-     * ${refName:some-text}, and returns the text inside the reference.
+     * <link ... href=, and returns the text inside the reference.
      * 
      * @param content
      *            String in which to look for the reference.
@@ -50,18 +50,57 @@
      * @return Text contained in the reference or null if no reference is found.
      */
     private String findNextReference(String content, String refName) {
-        int start = content.indexOf("${" + refName + ":");
-        if (start == -1)
+        int h, ch;
+        int start;
+        if (refName.equals("link")) {
+            h = content.indexOf(" href="); //search for one of the link types            
+            if (h == -1)
+                {   
+//                	ch = content.indexOf("HREF=");//search for the capitalized version as well
+//                	if(ch == -1)
+                	  return null;
+//                	else 
+//                	    {
+//                	    	start = ch; //found the capitalized version
+//                	    	content= content.substring(0, ch) +
+//                	    	         content.substring(ch, ch+4).toLowerCase() +
+//                	    	         content.substring(ch+4); //need to make it lower case for
+//                	    	//later parsing
+//                	    } 
+                }
+            else start = h;    
+            int begin = content.substring(start).indexOf('"');
+            int end = content.substring(start + begin + 1).indexOf('"');
+            begin += start;
+            end += begin;
+            return content.substring(begin + 1, end + 1);
+        }
+        else if(refName.equals("image"))
+        {
+            start=content.indexOf("<img src=");
+            if (start == -1)
+                return null;
+            int begin = content.substring(start).indexOf('"');
+            int end=content.substring(start+begin+1).indexOf('"');
+            begin+=start; end+=begin;
+           return content.substring(begin+1, end+1);}
+        else
             return null;
-
-        int stop = content.substring(start).indexOf('}');
-        if (stop == -1)
-            return null;
-        
-        stop += start;
-
-        return content.substring(start + 2 + refName.length() + 1, stop);
     }
+    
+    /**
+     * Figures out if a link is an off-site link. This recognizes the most
+     * common protocols by checking how it starts. (clears all white space in
+     * case the link starts with '\n' or [space]
+     * 
+     * @author Janne Jalkanen
+     */
+    private boolean isExternalLink(String link) {
+        link = link.trim();
+        return link.startsWith("http:") || link.startsWith("ftp:")
+                || link.startsWith("https:") || link.startsWith("mailto:")
+                || link.startsWith("news:") || link.startsWith("file:");
+    }
 
     public void doView(JBossRenderRequest request, JBossRenderResponse response)
             throws IOException {
@@ -95,24 +134,58 @@
                 throw new Exception();
 
             String nextRef;
+            while(pageContent.indexOf("HREF=")!= -1)
+            {
+                pageContent = forgeHelper.replace(pageContent,"HREF=", "href=");
+             }
 
-            // Replacing links
-            while ((nextRef = findNextReference(pageContent, "link")) != null)
-                pageContent = forgeHelper.replace(pageContent, "${link:"
-                        + nextRef + "}", projectsHelper.createFreezonePageLink(
-                        portalName, projectId, nextRef));
+//          Replacing links
+            while ((nextRef = findNextReference(pageContent, "link")) != null) {
+               if(!isExternalLink(nextRef))
+               //it would be relative not outside link
+                    pageContent = forgeHelper.replace(pageContent, "href="
+                            + '"' + nextRef + '"',
+                            projectsHelper.createFreezonePageLink(portalName,
+                                    projectId, nextRef) + '"');
+                else {
+                    pageContent = forgeHelper.replace(pageContent, "href="
+                            + '"' + nextRef, "$"+nextRef+'"');
+                }
+            }
 
             // Replacing images
             String imagePrepend = "/file-access/" + portalName + "/"
-                    + ProjectsHelper.MEMBERS_DIR + "/" + projectId + "/";
+                    + ProjectsHelper.MEMBERS_DIR + "/" + projectId + "/"+ProjectsHelper.FREEZONE_DIR+"/";
             while ((nextRef = findNextReference(pageContent, "image")) != null)
-                pageContent = forgeHelper.replace(pageContent, "${image:"
-                        + nextRef + "}", imagePrepend + nextRef);
+                pageContent = forgeHelper.replace(pageContent, "<img src="+'"'
+                        + nextRef+'"', "*img src="+'"'+imagePrepend + nextRef+'"');
+            
+            //fix back internal links
+            while (pageContent.indexOf(" /portal/index.html?ctrl:id") != -1)
+                pageContent = forgeHelper.replace(pageContent,
+                        " /portal/index.html?ctrl:id", " href=" + '"'
+                                + "/portal/index.html?ctrl:id");
 
+            //fix back external links
+           
+            while (pageContent.indexOf("$http:") != -1
+                    || pageContent.indexOf("$ftp:") != -1 
+                    || pageContent.indexOf("$https:") != -1
+                    || pageContent.indexOf("$file:") != -1
+                    || pageContent.indexOf("$mailto:") != -1
+                    || pageContent.indexOf("$news:") != -1)
+                {pageContent = forgeHelper.replace(pageContent, "$",
+                        " href=" + '"');}
+            //fix back image links
+            while (pageContent.indexOf("*img src=") != -1 )
+            {pageContent = forgeHelper.replace(pageContent, "*img src=",
+                    "<img src=");}
+
             response.getWriter().write(pageContent);
         } catch (Exception e) {
             response.getWriter().write(
-                    "The page you requested cannot be accessed");
+                    "The page you requested cannot be accessed due to "
+                            + e.toString());
         }
     }
 }

Modified: trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/common.css
===================================================================
--- trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/common.css	2005-08-25 19:23:17 UTC (rev 964)
+++ trunk/forge/portal-extensions/forge-theme/jbossForgeLayout.war/common.css	2005-08-25 19:26:42 UTC (rev 965)
@@ -16,7 +16,7 @@
 
 p { line-height: 150%; }
 pre { font-family: Andale Mono, Courier New, Courier, monospace; }
-code { font: 11px Andale Mono, Courier New, Courier, monospace; line-height: 110%; white-space: pre; padding: 5px; margin: 5px; background-color: #efefef; width: 550px; overflow: visible; }
+code { font: 11px Andale Mono, Courier New, Courier, monospace; line-height: 80%; white-space: pre; padding: 5px; margin: 5px; background-color: #efefef; width: 550px; overflow: visible; }
 
 hr { color: #6e6e6e; }
 

[Jboss-svn-commits] JBL Code SVN: r964 - trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy

[<jbo...@li...>]

Author: adamw
Date: 2005-08-25 15:23:17 -0400 (Thu, 25 Aug 2005)
New Revision: 964

Removed:
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop.deployer/
Log:
Removing old deployer

[Jboss-svn-commits] JBL Code SVN: r963 - in trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all: deploy deploy/ejb3.deployer deploy/ejb3.deployer/META-INF deploy/jboss-aop-jdk50.deployer deploy/jboss-aop-jdk50.deployer/META-INF deploy/jboss-aop.deployer lib

[<jbo...@li...>]

Author: adamw
Date: 2005-08-25 15:15:12 -0400 (Thu, 25 Aug 2005)
New Revision: 963

Added:
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-clustered-sfsbcache-service.xml
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-entity-cache-service.xml
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-interceptors-aop.xml
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/jboss-service.xml
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/persistence.properties
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/antlr-2.7.5H3.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/asm-attrs.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/asm.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/cglib-2.1.1.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-beanutils.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-codec-1.2.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-collections.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-digester-1.6.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-discovery.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-fileupload.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-httpclient.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-lang-1.0.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-logging.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-pool.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/dom4j.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/ejb3-persistence.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-annotations.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-entitymanager.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate3.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jaxen-1.1-beta-4.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3x.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/MANIFEST.MF
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/jboss-service.xml
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/base-aop.xml
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/javassist.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/trove.jar
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop.deployer/
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop.deployer/META-INF/
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/lib/jboss-xb.jar
Removed:
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop.deployer/
Log:
EJB3 in as


Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-clustered-sfsbcache-service.xml
===================================================================
--- trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-clustered-sfsbcache-service.xml	2005-08-25 17:46:37 UTC (rev 962)
+++ trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-clustered-sfsbcache-service.xml	2005-08-25 19:15:12 UTC (rev 963)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+   <mbean code="org.jboss.ejb3.cache.tree.PassivationTreeCache" name="jboss.cache:service=EJB3SFSBClusteredCache">
+      <!--
+              Node locking level : SERIALIZABLE
+                                   REPEATABLE_READ (default)
+                                   READ_COMMITTED
+                                   READ_UNCOMMITTED
+                                   NONE
+      -->
+      <attribute name="IsolationLevel">READ_UNCOMMITTED</attribute>
+
+      <!--     Valid modes are LOCAL
+                               REPL_ASYNC
+                               REPL_SYNC
+      -->
+      <attribute name="CacheMode">REPL_SYNC</attribute>
+
+      <attribute name="ClusterName">SFSB-Cache</attribute>
+
+      <attribute name="ClusterConfig">
+         <config>
+            <!-- UDP: if you have a multihomed machine,
+                    set the bind_addr attribute to the appropriate NIC IP address
+            -->
+            <!-- UDP: On Windows machines, because of the media sense feature
+                     being broken with multicast (even after disabling media sense)
+                     set the loopback attribute to true
+            -->
+            <UDP mcast_addr="${jboss.partition.udpGroup:228.1.2.3}" mcast_port="45551" ip_ttl="64" ip_mcast="true"
+               mcast_send_buf_size="150000" mcast_recv_buf_size="80000" ucast_send_buf_size="150000"
+               ucast_recv_buf_size="80000" loopback="false"/>
+            <PING timeout="2000" num_initial_members="3" up_thread="false" down_thread="false"/>
+            <MERGE2 min_interval="10000" max_interval="20000"/>
+            <FD shun="true" up_thread="true" down_thread="true"/>
+            <VERIFY_SUSPECT timeout="1500" up_thread="false" down_thread="false"/>
+            <pbcast.NAKACK gc_lag="50" max_xmit_size="8192" retransmit_timeout="600,1200,2400,4800" up_thread="false"
+               down_thread="false"/>
+            <UNICAST timeout="600,1200,2400" window_size="100" min_threshold="10" down_thread="false"/>
+            <pbcast.STABLE desired_avg_gossip="20000" up_thread="false" down_thread="false"/>
+            <FRAG frag_size="8192" down_thread="false" up_thread="false"/>
+            <pbcast.GMS join_timeout="5000" join_retry_timeout="2000" shun="true" print_local_addr="true"/>
+            <pbcast.STATE_TRANSFER up_thread="false" down_thread="false"/>
+         </config>
+      </attribute>
+
+      <!--    Number of milliseconds to wait until all responses for a
+              synchronous call have been received.
+      -->
+      <attribute name="SyncReplTimeout">10000</attribute>
+
+      <!--  Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name="LockAcquisitionTimeout">15000</attribute>
+
+      <!--  Name of the eviction policy class. -->
+      <attribute name="EvictionPolicyClass">org.jboss.ejb3.cache.tree.StatefulEvictionPolicy</attribute>
+
+      <!--  Specific eviction policy configurations. This is LRU -->
+      <attribute name="EvictionPolicyConfig">
+         <config>
+            <attribute name="wakeUpIntervalSeconds">1</attribute>
+            <name>statefulClustered</name>
+            <region name="/_default_">
+               <attribute name="maxNodes">1000000</attribute>
+               <attribute name="timeToIdleSeconds">300</attribute>
+            </region>
+
+         </config>
+      </attribute>
+
+      <attribute name="CacheLoaderFetchPersistentState">false</attribute>
+      <attribute name="CacheLoaderFetchTransientState">true</attribute>
+      <attribute name="FetchStateOnStartup">true</attribute>
+      <attribute name="CacheLoaderClass">org.jboss.ejb3.cache.tree.StatefulCacheLoader</attribute>
+      <attribute name="CacheLoaderConfig">location=statefulClustered</attribute>
+   </mbean>
+
+</server>
+

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-entity-cache-service.xml
===================================================================
--- trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-entity-cache-service.xml	2005-08-25 17:46:37 UTC (rev 962)
+++ trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-entity-cache-service.xml	2005-08-25 19:15:12 UTC (rev 963)
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+
+  <!--  ====================================================================  -->
+  <!--  Defines TreeCache configuration                                       -->
+  <!--  ====================================================================  -->
+  <mbean code="org.jboss.cache.TreeCache" name="jboss.cache:service=EJB3EntityTreeCache">
+    <depends>jboss:service=Naming</depends>
+    <depends>jboss:service=TransactionManager</depends>
+
+    <!-- Configure the TransactionManager -->
+    <attribute name="TransactionManagerLookupClass">org.jboss.cache.JBossTransactionManagerLookup</attribute>
+
+    <!--
+            Node locking level : SERIALIZABLE
+                                 REPEATABLE_READ (default)
+                                 READ_COMMITTED
+                                 READ_UNCOMMITTED
+                                 NONE
+    -->
+    <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+
+    <!--     Valid modes are LOCAL
+                             REPL_ASYNC
+                             REPL_SYNC
+    -->
+    <attribute name="CacheMode">REPL_SYNC</attribute>
+
+    <!-- Name of cluster. Needs to be the same for all clusters, in order
+             to find each other -->
+    <attribute name="ClusterName">EJB3-entity-cache</attribute>
+
+    <attribute name="ClusterConfig">
+      <config>
+        <!-- UDP: if you have a multihomed machine,
+                set the bind_addr attribute to the appropriate NIC IP address
+        -->
+        <!-- UDP: On Windows machines, because of the media sense feature
+                 being broken with multicast (even after disabling media sense)
+                 set the loopback attribute to true
+        -->
+        <UDP mcast_addr="${jboss.partition.udpGroup:228.1.2.3}" mcast_port="43333" ip_ttl="2" ip_mcast="true"
+           mcast_send_buf_size="150000" mcast_recv_buf_size="80000" ucast_send_buf_size="150000"
+           ucast_recv_buf_size="80000" loopback="false" />
+        <PING timeout="2000" num_initial_members="3" up_thread="false" down_thread="false" />
+        <MERGE2 min_interval="10000" max_interval="20000" />
+        <FD shun="true" up_thread="true" down_thread="true" />
+        <VERIFY_SUSPECT timeout="1500" up_thread="false" down_thread="false" />
+        <pbcast.NAKACK gc_lag="50" max_xmit_size="8192" retransmit_timeout="600,1200,2400,4800" up_thread="false"
+           down_thread="false" />
+        <UNICAST timeout="600,1200,2400" window_size="100" min_threshold="10" down_thread="false" />
+        <pbcast.STABLE desired_avg_gossip="20000" up_thread="false" down_thread="false" />
+        <FRAG frag_size="8192" down_thread="false" up_thread="false" />
+        <pbcast.GMS join_timeout="5000" join_retry_timeout="2000" shun="true" print_local_addr="true" />
+        <pbcast.STATE_TRANSFER up_thread="false" down_thread="false" />
+      </config>
+    </attribute>
+
+    <!--    The max amount of time (in milliseconds) we wait until the
+            initial state (ie. the contents of the cache) are retrieved from
+            existing members in a clustered environment
+    -->
+    <attribute name="InitialStateRetrievalTimeout">5000</attribute>
+
+    <!--    Number of milliseconds to wait until all responses for a
+            synchronous call have been received.
+    -->
+    <attribute name="SyncReplTimeout">10000</attribute>
+
+    <!--  Max number of milliseconds to wait for a lock acquisition -->
+    <attribute name="LockAcquisitionTimeout">15000</attribute>
+
+    <!--  Name of the eviction policy class. -->
+    <attribute name="EvictionPolicyClass">org.jboss.cache.eviction.LRUPolicy</attribute>
+
+    <!--  Specific eviction policy configurations. This is LRU -->
+    <attribute name="EvictionPolicyConfig">
+      <config>
+        <attribute name="wakeUpIntervalSeconds">5</attribute>
+        <!--  Cache wide default -->
+        <region name="/_default_">
+         <attribute name="maxNodes">5000</attribute>
+         <attribute name="timeToLiveSeconds">1000</attribute>
+       </region>
+      </config>
+    </attribute>
+
+  </mbean>
+
+</server>
+

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-interceptors-aop.xml
===================================================================
--- trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-interceptors-aop.xml	2005-08-25 17:46:37 UTC (rev 962)
+++ trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3-interceptors-aop.xml	2005-08-25 19:15:12 UTC (rev 963)
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE aop PUBLIC
+   "-//JBoss//DTD JBOSS AOP 1.0//EN"
+   "http://www.jboss.org/aop/dtd/jboss-aop_1_0.dtd">
+
+<aop>
+   <interceptor class="org.jboss.aspects.remoting.InvokeRemoteInterceptor" scope="PER_VM"/>
+   <interceptor class="org.jboss.aspects.security.SecurityClientInterceptor" scope="PER_VM"/>
+   <interceptor class="org.jboss.aspects.tx.ClientTxPropagationInterceptor" scope="PER_VM"/>
+   <interceptor class="org.jboss.ejb3.remoting.IsLocalInterceptor" scope="PER_VM"/>
+   <interceptor class="org.jboss.aspects.remoting.ClusterChooserInterceptor" scope="PER_VM"/>
+
+   <interceptor class="org.jboss.aspects.tx.TxPropagationInterceptor" scope="PER_VM"/>
+
+   <stack name="ServiceClientInterceptors">
+      <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+   </stack>
+
+   <stack name="AsynchronousStatelessSessionClientInterceptors">
+      <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+   </stack>
+
+   <stack name="AsynchronousStatefulSessionClientInterceptors">
+      <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+   </stack>
+
+   <stack name="StatelessSessionClientInterceptors">
+      <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+   </stack>
+
+   <stack name="StatefulSessionClientInterceptors">
+      <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+   </stack>
+
+   <stack name="ClusteredStatelessSessionClientInterceptors">
+      <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+   </stack>
+
+   <stack name="ClusteredStatefulSessionClientInterceptors">
+      <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.security.SecurityClientInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
+   </stack>
+
+   <interceptor class="org.jboss.ejb3.asynchronous.AsynchronousInterceptor" scope="PER_CLASS"/>
+   <interceptor factory="org.jboss.ejb3.security.RoleBasedAuthorizationInterceptorFactory" scope="PER_CLASS"/>
+   <interceptor factory="org.jboss.ejb3.security.AuthenticationInterceptorFactory" scope="PER_CLASS"/>
+   <interceptor factory="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory" scope="PER_CLASS"/>
+   <interceptor class="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor" scope="PER_VM"/>
+   <interceptor class="org.jboss.ejb3.stateless.StatelessInstanceInterceptor" scope="PER_VM"/>
+   <interceptor class="org.jboss.ejb3.stateful.StatefulInstanceInterceptor" scope="PER_VM"/>
+   <interceptor class="org.jboss.ejb3.service.ServiceSingletonInterceptor" scope="PER_VM"/>
+   <interceptor class="org.jboss.ejb3.cache.StatefulReplicationInterceptor" scope="PER_VM"/>
+   <interceptor class="org.jboss.ejb3.entity.BeforeTxFlushModeInterceptor" scope="PER_VM"/>
+   <interceptor factory="org.jboss.ejb3.entity.FlushModeInterceptorFactory" scope="PER_CLASS_JOINPOINT"/>
+   <interceptor factory="org.jboss.ejb3.stateful.StatefulRemoveFactory" scope="PER_CLASS_JOINPOINT"/>
+   <interceptor factory="org.jboss.ejb3.tx.TxInterceptorFactory" scope="PER_CLASS_JOINPOINT"/>
+   <interceptor factory="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory" scope="PER_CLASS"/>
+   <interceptor factory="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory" scope="PER_CLASS"/>
+   <interceptor class="org.jboss.ejb3.AllowedOperationsInterceptor" scope="PER_VM"/>
+
+   <typedef name="ejb3intercepted" expr="class(@javax.ejb.Interceptors) OR class(@javax.ejb.Interceptor) OR has(* *->@javax.ejb.AroundInvoke(..))"/>
+
+   <domain name="Stateless Bean">
+      <bind pointcut="execution(* *->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
+      </bind>
+      <bind pointcut="execution(* @org.jboss.annotation.security.SecurityDomain->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.security.RoleBasedAuthorizationInterceptorFactory"/>
+      </bind>
+      <bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
+      </bind>
+      <bind pointcut="execution(* @org.jboss.annotation.ejb.Clustered->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
+      </bind>
+      <bind pointcut="execution(* *->@javax.persistence.FlushMode(..))">
+         <interceptor-ref name="org.jboss.ejb3.entity.BeforeTxFlushModeInterceptor"/>
+      </bind>
+      <bind pointcut="execution(* *->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
+         <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+      </bind>
+      <bind pointcut="execution(* *->@javax.persistence.FlushMode(..))">
+         <interceptor-ref name="org.jboss.ejb3.entity.FlushModeInterceptorFactory"/>
+      </bind>
+      <bind pointcut="execution(* $typedef{ejb3intercepted}->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+      </bind>
+      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
+         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
+      </annotation>
+   </domain>
+
+   <domain name="Base Stateful Bean">
+      <bind pointcut="execution(* *->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
+      </bind>
+      <bind pointcut="execution(* @org.jboss.annotation.security.SecurityDomain->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.security.RoleBasedAuthorizationInterceptorFactory"/>
+      </bind>
+      <bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
+      </bind>
+      <bind pointcut="execution(* @org.jboss.annotation.ejb.Clustered->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
+      </bind>
+      <bind pointcut="execution(* *->@javax.ejb.Remove(..))">
+         <interceptor-ref name="org.jboss.ejb3.stateful.StatefulRemoveFactory"/>
+      </bind>
+      <bind pointcut="execution(* *->@javax.persistence.FlushMode(..))">
+         <interceptor-ref name="org.jboss.ejb3.entity.BeforeTxFlushModeInterceptor"/>
+      </bind>
+      <bind pointcut="execution(* *->*(..))">
+         <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+         <interceptor-ref name="org.jboss.ejb3.stateful.StatefulInstanceInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+      </bind>
+      <bind pointcut="execution(* *->@javax.persistence.FlushMode(..))">
+         <interceptor-ref name="org.jboss.ejb3.entity.FlushModeInterceptorFactory"/>
+      </bind>
+      <bind pointcut="execution(* *->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
+      </bind>
+
+      <bind pointcut="execution(* @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(* *->@javax.ejb.Remove(..))">
+         <interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
+      </bind>
+      <bind pointcut="execution(* $typedef{ejb3intercepted}->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+      </bind>
+      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
+         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
+      </annotation>
+   </domain>
+
+   <domain name="Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
+      <!-- NON Clustered cache configuration -->
+      <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
+         @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
+      </annotation>
+      <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
+         @org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
+      </annotation>
+      <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
+         @org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000, idleTimeoutSeconds=300)
+      </annotation>
+
+      <!-- Clustered cache configuration -->
+      <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
+         @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
+      </annotation>
+      <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
+         @org.jboss.annotation.ejb.cache.tree.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300)
+      </annotation>
+   </domain>
+
+   <domain name="Embedded Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
+      <!-- NON Clustered cache configuration -->
+      <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache)">
+         @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.NoPassivationCache.class)
+      </annotation>
+
+   </domain>
+
+   <domain name="Message Driven Bean">
+      <bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
+      </bind>
+      <bind pointcut="execution(* *->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+      </bind>
+      <bind pointcut="execution(* $typedef{ejb3intercepted}->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+      </bind>
+      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
+         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
+      </annotation>
+   </domain>
+
+   <domain name="Service Bean">
+      <bind pointcut="execution(* *->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
+      </bind>
+      <bind pointcut="execution(* @org.jboss.annotation.security.SecurityDomain->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.security.RoleBasedAuthorizationInterceptorFactory"/>
+      </bind>
+      <bind pointcut="execution(* @javax.annotation.security.RunAs->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
+      </bind>
+      <bind pointcut="execution(* *->@javax.persistence.FlushMode(..))">
+         <interceptor-ref name="org.jboss.ejb3.entity.BeforeTxFlushModeInterceptor"/>
+      </bind>
+      <bind pointcut="execution(* *->*(..))">
+         <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+      </bind>
+      <bind pointcut="execution(* $typedef{ejb3intercepted}->*(..)) AND !execution(* *->create()) AND !execution(* *->start())">
+         <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+      </bind>
+   </domain>
+
+</aop>
\ No newline at end of file

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/jboss-service.xml
===================================================================
--- trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/jboss-service.xml	2005-08-25 17:46:37 UTC (rev 962)
+++ trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/jboss-service.xml	2005-08-25 19:15:12 UTC (rev 963)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+  <mbean code="org.jboss.ejb3.EJB3Deployer" name="jboss.ejb3:service=EJB3Deployer">
+    <depends>jboss.aop:service=AspectDeployer</depends>
+  </mbean>
+
+  <mbean code="org.jboss.remoting.transport.Connector"
+    xmbean-dd="org/jboss/remoting/transport/Connector.xml"
+    name="jboss.remoting:type=Connector,transport=socket3873,handler=ejb3">
+    <depends>jboss.aop:service=AspectDeployer</depends>
+    <attribute name="InvokerLocator">socket://0.0.0.0:3873</attribute>
+    <attribute name="Configuration">
+      <handlers>
+        <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
+      </handlers>
+    </attribute>
+  </mbean>
+
+</server>

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/persistence.properties
===================================================================
--- trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/persistence.properties	2005-08-25 17:46:37 UTC (rev 962)
+++ trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF/persistence.properties	2005-08-25 19:15:12 UTC (rev 963)
@@ -0,0 +1,15 @@
+hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
+hibernate.connection.release_mode=after_statement
+hibernate.transaction.flush_before_completion=false
+hibernate.transaction.auto_close_session=false
+hibernate.query.factory_class=org.hibernate.hql.ast.ASTQueryTranslatorFactory
+hibernate.hbm2ddl.auto=create-drop
+#hibernate.hbm2ddl.auto=create
+hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider
+# Clustered cache with TreeCache
+#hibernate.cache.provider_class=org.jboss.ejb3.entity.TreeCacheProviderHook
+#hibernate.treecache.mbean.object_name=jboss.cache:service=EJB3EntityTreeCache
+hibernate.connection.datasource=java:/DefaultDS
+hibernate.dialect=org.hibernate.dialect.HSQLDialect
+hibernate.jndi.java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+hibernate.jndi.java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/antlr-2.7.5H3.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/antlr-2.7.5H3.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/asm-attrs.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/asm-attrs.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/asm.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/asm.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/cglib-2.1.1.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/cglib-2.1.1.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-beanutils.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-beanutils.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-codec-1.2.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-codec-1.2.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-collections.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-collections.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-digester-1.6.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-digester-1.6.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-discovery.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-discovery.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-fileupload.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-fileupload.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-httpclient.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-httpclient.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-lang-1.0.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-lang-1.0.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-logging.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-logging.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-pool.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/commons-pool.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/dom4j.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/dom4j.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/ejb3-persistence.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/ejb3-persistence.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-annotations.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-annotations.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-entitymanager.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate-entitymanager.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate3.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/hibernate3.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jaxen-1.1-beta-4.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jaxen-1.1-beta-4.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3x.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/jboss-ejb3x.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/MANIFEST.MF
===================================================================
--- trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/MANIFEST.MF	2005-08-25 17:46:37 UTC (rev 962)
+++ trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/MANIFEST.MF	2005-08-25 19:15:12 UTC (rev 963)
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Ant-Version: Apache Ant 1.6.2
+Created-By: 1.5.0_03-b07 (Sun Microsystems Inc.)
+Specification-Title: JBoss AOP Aspect Library
+Specification-Version: jboss-aspect-library-1.3
+Specification-Vendor: JBoss (http://www.jboss.org/)
+Implementation-Title: JBoss AOP Aspect Library
+Implementation-URL: http://www.jboss.org/
+Implementation-Version: jboss-aspect-library-1.3
+Implementation-Vendor: JBoss.org
+Implementation-Vendor-Id: http://www.jboss.org/
+

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/jboss-service.xml
===================================================================
--- trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/jboss-service.xml	2005-08-25 17:46:37 UTC (rev 962)
+++ trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF/jboss-service.xml	2005-08-25 19:15:12 UTC (rev 963)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id: jboss-service.xml,v 1.3.2.3 2005/06/19 07:08:07 bill Exp $ -->
+
+<!-- ===================================================================== -->
+<!--  JBoss Server Configuration                                           -->
+<!-- ===================================================================== -->
+
+<server>
+
+   <mbean code="org.jboss.aop.deployment.AspectManagerService"
+      name="jboss.aop:service=AspectManager">
+      <attribute name="EnableLoadtimeWeaving">false</attribute>
+      <!-- only relevant when EnableLoadtimeWeaving is true.  
+           When transformer is on, every loaded class gets 
+           transformed.  If AOP can't find the class, then it 
+           throws an exception.  Sometimes, classes may not have 
+           all the classes they reference.  So, the Suppressing 
+           is needed.  (i.e. Jboss cache in the default configuration -->
+      <attribute name="SuppressTransformationErrors">true</attribute>
+      <attribute name="Prune">true</attribute>
+      <attribute name="Include">org.jboss.test</attribute>
+      <attribute name="Exclude">org.jboss.</attribute>
+      <attribute name="Optimized">true</attribute>
+      <attribute name="Verbose">false</attribute>
+   </mbean>
+
+   <mbean code="org.jboss.aop.deployment.AspectDeployer"
+      name="jboss.aop:service=AspectDeployer">
+   </mbean>
+
+</server>

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/base-aop.xml
===================================================================
--- trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/base-aop.xml	2005-08-25 17:46:37 UTC (rev 962)
+++ trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/base-aop.xml	2005-08-25 19:15:12 UTC (rev 963)
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE aop PUBLIC
+   "-//JBoss//DTD JBOSS AOP 1.0//EN"
+   "http://www.jboss.org/aop/dtd/jboss-aop_1_0.dtd">
+
+<aop>
+   <!-- custom configuration for AOP Security -->
+   <metadata-loader tag="security" class="org.jboss.aspects.security.SecurityClassMetaDataLoader"/>
+
+   <stack name="J2EESecurityStack">
+      <interceptor factory="org.jboss.aspects.security.AuthenticationInterceptorFactory" scope="PER_CLASS"/>
+      <interceptor factory="org.jboss.aspects.security.RoleBasedAuthorizationInterceptorFactory" scope="PER_CLASS"/>
+      <interceptor class="org.jboss.aspects.security.RunAsSecurityInterceptor"/>
+   </stack>
+
+   <bind pointcut="all(@security)">
+      <stack-ref name="J2EESecurityStack"/>
+   </bind>
+
+   <bind pointcut="all(@org.jboss.aspects.security.Permissions)">
+      <stack-ref name="J2EESecurityStack"/>
+   </bind>
+
+   <bind pointcut="all(@org.jboss.aspects.security.Unchecked)">
+      <stack-ref name="J2EESecurityStack"/>
+   </bind>
+
+   <bind pointcut="all(@org.jboss.aspects.security.Exclude)">
+      <stack-ref name="J2EESecurityStack"/>
+   </bind>
+
+   <introduction expr="class(@org.jboss.aspects.jmx.MBean)">
+      <mixin>
+         <interfaces>javax.management.DynamicMBean</interfaces>
+         <class>org.jboss.aspects.jmx.JmxIntrospectingMixin</class>
+         <construction>new org.jboss.aspects.jmx.JmxIntrospectingMixin(this)</construction>
+      </mixin>
+   </introduction>
+
+   <!-- asynchronous aspect -->
+   <aspect class="org.jboss.aspects.asynch.AsynchAspect" scope="PER_INSTANCE">
+      <advisor-attribute name="Advisor"/>
+   </aspect>
+
+   <bind pointcut="execution(!static * *->@org.jboss.aspects.asynch.Asynchronous(..))">
+      <advice name="execute" aspect="org.jboss.aspects.asynch.AsynchAspect"/>
+   </bind>
+
+   <introduction expr="has(!static * *->@org.jboss.aspects.asynch.Asynchronous(..))">
+      <mixin>
+         <interfaces>org.jboss.aspects.asynch.AsynchProvider,org.jboss.aspects.asynch.FutureHolder</interfaces>
+         <class>org.jboss.aspects.asynch.AsynchMixin</class>
+      </mixin>
+   </introduction>
+
+   <!-- old asynch aspect from Claude -->
+
+   <aspect class="org.jboss.aspects.asynchronous.aspects.jboss.AsynchronousAspect" scope="PER_VM"/>
+
+   <bind pointcut="execution(* *->@org.jboss.aspects.asynchronous.aspects.jboss.Asynchronous(..))">
+      <advice name="execute" aspect="org.jboss.aspects.asynchronous.aspects.jboss.AsynchronousAspect"/>
+   </bind>
+
+   <introduction expr="has(* *->@org.jboss.aspects.asynchronous.aspects.jboss.Asynchronous(..)) OR class(@org.jboss.aspects.asynchronous.aspects.jboss.Asynchronous)">
+
+      <mixin>
+         <interfaces>
+            org.jboss.aspects.asynchronous.aspects.AsynchronousFacade
+         </interfaces>
+         <class>org.jboss.aspects.asynchronous.aspects.AsynchronousFacadeImpl</class>
+         <construction>new org.jboss.aspects.asynchronous.aspects.AsynchronousFacadeImpl()</construction>
+      </mixin>
+   </introduction>
+
+   <!-- TRANSACTIONS -->
+   <interceptor class="org.jboss.aspects.tx.TxPropagationInterceptor" scope="PER_VM"/>
+   <interceptor factory="org.jboss.aspects.tx.TxInterceptorFactory" scope="PER_CLASS_JOINPOINT"/>
+
+   <bind pointcut="all(@transaction)">
+      <interceptor-ref name="org.jboss.aspects.tx.TxInterceptorFactory"/>
+   </bind>
+
+   <interceptor name="class-txsynchronized" factory="org.jboss.aspects.txlock.TxLockInterceptorFactory" scope="PER_CLASS"/>
+   <interceptor name="instance-txsynchronized" factory="org.jboss.aspects.txlock.TxLockInterceptorFactory" scope="PER_INSTANCE"/>
+
+   <bind pointcut="execution(static * *->@TxSynchronized(..)) OR execution(*->@TxSynchronized(..))">
+      <interceptor-ref name="class-txsynchronized"/>
+   </bind>
+
+   <bind pointcut="execution(!static * *->@TxSynchronized(..))">
+      <interceptor-ref name="instance-txsynchronized"/>
+   </bind>
+
+   <bind pointcut="all(@org.jboss.aspects.tx.Tx)">
+      <interceptor-ref name="org.jboss.aspects.tx.TxInterceptorFactory"/>
+   </bind>
+
+   <bind pointcut="execution(static * *->@org.jboss.aspects.txlock.TxSynchronized(..)) OR execution(*->@org.jboss.aspects.txlock.TxSynchronized(..))">
+      <interceptor-ref name="class-txsynchronized"/>
+   </bind>
+
+   <bind pointcut="execution(!static * *->@org.jboss.aspects.txlock.TxSynchronized(..))">
+      <interceptor-ref name="instance-txsynchronized"/>
+   </bind>
+
+   <!-- injection -->
+   <aspect class="org.jboss.aspects.tx.TransactionInjector"/>
+   <aspect class="org.jboss.aspects.tx.TransactionManagerInjector"/>
+
+   <bind pointcut="field(javax.transaction.Transaction *->@org.jboss.aspects.Current)">
+      <advice name="access" aspect="org.jboss.aspects.tx.TransactionInjector"/>
+   </bind>
+
+   <bind pointcut="field(javax.transaction.TransactionManager *->@org.jboss.aspects.Injected)">
+      <advice name="access" aspect="org.jboss.aspects.tx.TransactionManagerInjector"/>
+   </bind>
+
+   <bind pointcut="execution(*->new(..)) AND hasfield(javax.transaction.TransactionManager *->@org.jboss.aspects.Injected)">
+      <advice name="allocation" aspect="org.jboss.aspects.tx.TransactionManagerInjector"/>
+   </bind>
+
+   <!-- special types -->
+   <aspect class="org.jboss.aspects.ThreadbasedAspect" scope="PER_JOINPOINT"/>
+   <bind pointcut="field(* *->@org.jboss.aspects.Threadbased)">
+      <advice name="access" aspect="org.jboss.aspects.ThreadbasedAspect"/>
+   </bind>
+
+   <aspect class="org.jboss.aspects.tx.TransactionLocalAspect" scope="PER_JOINPOINT"/>
+   <bind pointcut="field(* *->@org.jboss.aspects.tx.TxLocal)">
+      <advice name="access" aspect="org.jboss.aspects.tx.TransactionLocalAspect"/>
+   </bind>
+
+</aop>

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/javassist.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/javassist.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/trove.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/trove.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/lib/jboss-xb.jar
===================================================================
(Binary files differ)


Property changes on: trunk/forge/portal-extensions/jboss-as-binaries/to-copy/server/all/lib/jboss-xb.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

[Jboss-svn-commits] JBL Code SVN: r961 - trunk/forge/portal-extensions/jboss-as-binaries

[<jbo...@li...>]

Author: adamw
Date: 2005-08-25 13:43:46 -0400 (Thu, 25 Aug 2005)
New Revision: 961

Removed:
   trunk/forge/portal-extensions/jboss-as-binaries/to-copy/
Log:
Deleting old as

[Jboss-svn-commits] JBL Code SVN: r960 - trunk/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor

[<jbo...@li...>]

Author: adamw
Date: 2005-08-25 12:33:00 -0400 (Thu, 25 Aug 2005)
New Revision: 960

Modified:
   trunk/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java
Log:
URL scheme fix


Modified: trunk/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java
===================================================================
--- trunk/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java	2005-08-25 16:16:49 UTC (rev 959)
+++ trunk/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java	2005-08-25 16:33:00 UTC (rev 960)
@@ -44,17 +44,19 @@
 	static String getBaseServerAddress() {
 		int port;
 		String server;
+		String scheme;
 		Object request = getExternalContext().getRequest();
 		if (request instanceof JBossActionRequest) {
+			scheme = ((JBossActionRequest) request).getScheme();
 			port = ((JBossActionRequest) request).getServerPort();
 			server = ((JBossActionRequest) request).getServerName();
 		} else if (request instanceof JBossRenderRequest) {
+			scheme = ((JBossRenderRequest) request).getScheme();
 			port = ((JBossRenderRequest) request).getServerPort();
 			server = ((JBossRenderRequest) request).getServerName();
 		} else return "";
 		
-		return (((port == 80) || (port == 8080)) ? "http" : "https") + 
-			"://" + server + ":" + port;
+		return scheme + "://" + server + ":" + port;
 	}
 	
 	static String getPortalName() {

[Jboss-svn-commits] JBL Code SVN: r959 - in trunk/forge/portal-extensions/forge-wiki/src: etc/org/jboss/wiki java/org/jboss/wiki java/org/jboss/wiki/plugins web/WEB-INF/jsp

[<jbo...@li...>]

Author: szimano
Date: 2005-08-25 12:16:49 -0400 (Thu, 25 Aug 2005)
New Revision: 959

Added:
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/SecureLinksPlugin.java
Modified:
   trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
   trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
Log:
secure connection support


Modified: trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml	2005-08-25 14:13:46 UTC (rev 958)
+++ trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml	2005-08-25 16:16:49 UTC (rev 959)
@@ -24,6 +24,10 @@
 			<name>friendlyLinks</name>
 			<class>org.jboss.wiki.plugins.FriendlyLinkPlugin</class>
 		</plugin>
+		<plugin>
+			<name>secureLinks</name>
+			<class>org.jboss.wiki.plugins.SecureLinksPlugin</class>
+		</plugin>
 	</wikiType>
 	<wikiType>
 		<name>DIFF</name>

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java	2005-08-25 14:13:46 UTC (rev 958)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java	2005-08-25 16:16:49 UTC (rev 959)
@@ -196,6 +196,7 @@
 	public void doView(JBossRenderRequest rReq, JBossRenderResponse rRes)
 			throws PortletException, java.io.IOException {
 
+		rReq.getPortletSession().setAttribute("isSecure", new Boolean(rReq.isSecure()));
 		
 		WikiPage noSuchPage = new WikiPage("", new Credentials(""),
 				"There is no such page. Click on EDIT to start it.", 0, 0,
@@ -329,7 +330,7 @@
 		PortletURL wikiURL = rRes.createActionURL();
 
 		rReq.setAttribute("actionURL", wikiURL.toString());
-
+		
 		rReq
 				.setAttribute(
 						"wikiName",
@@ -352,8 +353,14 @@
 		// pass friendly link
 		Properties props = new Properties();
 		props.load(WikiPlugin.class.getResourceAsStream("wikiPlugins.properties"));
-		rReq.setAttribute("firendlyLink", props.getProperty("htmlTranslatorURL")+"wiki/"+pageToShow.getName());
+		String href = props.getProperty("htmlTranslatorURL")+"wiki/"+pageToShow.getName();
 		
+		if (rReq.isSecure()) {
+			//change http to https
+			href = href.replaceFirst("http", "https");
+		}
+		
+		rReq.setAttribute("friendlyLink", href);
 			
 		rRes.setTitle("Wiki");
 		if (javax.portlet.WindowState.NORMAL.equals(rReq.getWindowState())

Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/SecureLinksPlugin.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/SecureLinksPlugin.java	2005-08-25 14:13:46 UTC (rev 958)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/SecureLinksPlugin.java	2005-08-25 16:16:49 UTC (rev 959)
@@ -0,0 +1,32 @@
+package org.jboss.wiki.plugins;
+
+import org.jboss.wiki.WikiPage;
+import org.jboss.wiki.WikiPlugin;
+import org.jboss.wiki.WikiSession;
+
+public class SecureLinksPlugin extends WikiPlugin {
+
+	@Override
+	public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) {
+		WikiPage newPage = null;
+
+		try {
+			newPage = (WikiPage) wikiPage.clone();
+		} catch (CloneNotSupportedException cl) {
+			System.err.println(cl);
+		}
+
+		if (((Boolean)wikiSession.getAttribute("isSecure")) == true) {
+			newPage.setPageContent(newPage.getPageContent().replaceAll(
+					"<a href=\"http", "<a href=\"https"));
+		}
+		return newPage;
+	}
+
+	@Override
+	public void init() {
+		// TODO Auto-generated method stub
+
+	}
+
+}

Modified: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp	2005-08-25 14:13:46 UTC (rev 958)
+++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp	2005-08-25 16:16:49 UTC (rev 959)
@@ -12,7 +12,7 @@
 	String wikiContent = (String)request.getAttribute("wikiContent");
 	String wikiPage = (String)request.getAttribute("wikiPage");
 	String defaultPage = (String)request.getAttribute("defaultPage");
-	String firendlyLink = (String)request.getAttribute("firendlyLink");
+	String friendlyLink = (String)request.getAttribute("friendlyLink");
 	String type = (String)request.getParameter("type");
 	java.util.Date editDate = (java.util.Date)request.getAttribute("editDate");
 	org.jboss.wiki.Credentials author = (org.jboss.wiki.Credentials)request.getAttribute("author");
@@ -26,7 +26,7 @@
 <table style="width: 100%" border="0">
 <tr style="vertical-align: bottom;">
 <td style="vertical-align: bottom; align-bottom: 0px;">
-<div><a href="<%=firendlyLink%>"><img  style="vertical-align: middle" alt="PERM LINK" src="/file-access/default/members/jbosswiki/images/permaLinkButton.png" /></a> <a href="<%=firendlyLink%>"><%=firendlyLink%></a></div>
+<div><a href="<%=friendlyLink%>"><img  style="vertical-align: middle" alt="PERM LINK" src="/file-access/default/members/jbosswiki/images/permaLinkButton.png" /></a> <a href="<%=friendlyLink%>"><%=friendlyLink%></a></div>
 </td>
 <td style="text-align: right;vertical-align: bottom; align-bottom: 0px;">
 

[Jboss-svn-commits] JBL Code SVN: r958 - trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki

[<jbo...@li...>]

Author: szimano
Date: 2005-08-25 10:13:46 -0400 (Thu, 25 Aug 2005)
New Revision: 958

Modified:
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.java
Log:
works also when file structure is incomplete


Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java	2005-08-25 13:43:49 UTC (rev 957)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java	2005-08-25 14:13:46 UTC (rev 958)
@@ -31,6 +31,8 @@
 	 * </p>
 	 * 
 	 */
+	private final String SAVE_COMMENT = "Saved by FileDataSource of JBoss Wiki";
+
 	private final String propFileName = "filedatasource.properties";// "/home/tomek/java/sandbox/new_svn/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/filedatasource.properties";
 
 	private String pathToMedia;
@@ -160,8 +162,7 @@
 				properties.setProperty(page.getLastVersion() + ".author", page
 						.getLastAuthor().getName());
 
-				properties.store(pageWriter,
-						"Saved by FileDataSource of JBoss Wiki");
+				properties.store(pageWriter, SAVE_COMMENT);
 
 				pageWriter.close();
 
@@ -197,21 +198,42 @@
 
 	public Properties getPageProps(String pageName) {
 		Properties pageProps = new Properties();
-		
+
 		try {
-			FileInputStream fpi = new FileInputStream(new File(pathToMedia + "/OLD/"
-					+ pageName + "/page.properties"));
+			FileInputStream fpi = new FileInputStream(new File(pathToMedia
+					+ "/OLD/" + pageName + "/page.properties"));
 			pageProps.load(fpi);
 			fpi.close();
 		} catch (IOException ioe) {
-			//TODO make file structure if this happens
-			
-			//System.err.println("Cannot read page.properties for page: "
-			//		+ pageName + " file: " + pathToMedia + "/OLD/" + pageName
-			//		+ "/page.properties\n" + ioe);
-			return null;
+			// There is no prop file for some reson - create one.
+
+			File pagePropsFile = new File(pathToMedia + "/OLD/" + pageName);
+
+			// create dirs
+			pagePropsFile.mkdirs();
+
+			// create file
+			pagePropsFile = new File(pathToMedia + "/OLD/" + pageName
+					+ "/page.properties");
+
+			try {
+				pagePropsFile.createNewFile();
+
+				if (pageExists(pageName)) {
+					// if page exists it looks like there is lack of the props structure
+					FileOutputStream fpo = new FileOutputStream(pagePropsFile);
+
+					pageProps.setProperty("1.author", "unknown");
+					pageProps.store(fpo, SAVE_COMMENT);
+					fpo.close();
+				}
+
+			} catch (IOException e) {
+				System.err.println("Cannot create page props file for page: "
+						+ pageName);
+			}
+			return pageProps;
 		}
-	
 
 		return pageProps;
 	}
@@ -249,8 +271,7 @@
 		try {
 			props.store(new FileOutputStream(new File(pathToAttachments + "/"
 					+ pageName + "-att/" + attName
-					+ "-dir/attachment.properties")),
-					"Saved by FileDataSource of JBoss Wiki");
+					+ "-dir/attachment.properties")), SAVE_COMMENT);
 		} catch (Exception ioe) {
 			System.err
 					.println("Cannot store attchement.properties for attachement: "
@@ -308,7 +329,6 @@
 				page.setLength(pageFile.length());
 			}
 		}
-		
 
 		return page;
 
@@ -324,15 +344,9 @@
 			System.out
 					.println("As for now, languages aren't supported in the wiki. Please do not use language codes");
 		}
-		// TODO Auto-generated method stub
 		return getPage(pageName);
 	}
 
-	public boolean save(Media media) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
 	public WikiPage getPageAtVersion(WikiPage originPage, boolean loadContent,
 			String languageCode, int version) {
 		if (languageCode != null) {

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.java	2005-08-25 13:43:49 UTC (rev 957)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.java	2005-08-25 14:13:46 UTC (rev 958)
@@ -23,18 +23,11 @@
  * @return 
  */
     public boolean preSave();
+    
 /**
  * <p>Does ...</p>
  * 
  * 
- * @return 
- * @param media 
- */
-    public boolean save(Media media);
-/**
- * <p>Does ...</p>
- * 
- * 
  * @param page 
  * @return 
  * @param languageCode 

[Jboss-svn-commits] JBL Code SVN: r957 - trunk/labs/kosmos/build

[<jbo...@li...>]

Author: aron.gombas
Date: 2005-08-25 09:43:49 -0400 (Thu, 25 Aug 2005)
New Revision: 957

Modified:
   trunk/labs/kosmos/build/build.xml
Log:
'.' prefix removed

Modified: trunk/labs/kosmos/build/build.xml
===================================================================
--- trunk/labs/kosmos/build/build.xml	2005-08-25 13:43:06 UTC (rev 956)
+++ trunk/labs/kosmos/build/build.xml	2005-08-25 13:43:49 UTC (rev 957)
@@ -29,15 +29,15 @@
   <property name="war.name" value="${module.name.short}.war"/>
   <property name="container.dir" location="${env.JBOSS_HOME}/server/default/deploy/${war.name}"/>
 
-  <property name="dist.root.dir" location=".dist-${module.name}"/>
+  <property name="dist.root.dir" location="dist-${module.name}"/>
 	
-  <property name="dist-bin.root.dir" location=".dist-bin-${module.name}"/>
+  <property name="dist-bin.root.dir" location="dist-bin-${module.name}"/>
   <property name="dist-bin.dir" location="${dist-bin.root.dir}/${module.name.full}"/>
   <property name="dist-bin.bin.dir" location="${dist-bin.dir}/${war.name}-expanded"/>
   <property name="dist-bin.classes.dir" location="${dist-bin.bin.dir}/WEB-INF/classes"/>
   <property name="dist-bin.docs.reference.dir" location="${dist-bin.dir}/docs/reference"/>
 	
-  <property name="dist-src.root.dir" location=".dist-src-${module.name}"/>
+  <property name="dist-src.root.dir" location="dist-src-${module.name}"/>
   <property name="dist-src.dir" location="${dist-src.root.dir}/${module.name.full}"/>
   <property name="dist-src.docs.api.dir" location="${dist-src.dir}/docs/api"/>
 

[Jboss-svn-commits] JBL Code SVN: r956 - trunk/labs/kosmos/xdocs/reference

[<jbo...@li...>]

Author: aron.gombas
Date: 2005-08-25 09:43:06 -0400 (Thu, 25 Aug 2005)
New Revision: 956

Modified:
   trunk/labs/kosmos/xdocs/reference/reference-manual.xml
Log:
Sun stuffs removed

Modified: trunk/labs/kosmos/xdocs/reference/reference-manual.xml
===================================================================
--- trunk/labs/kosmos/xdocs/reference/reference-manual.xml	2005-08-25 12:30:24 UTC (rev 955)
+++ trunk/labs/kosmos/xdocs/reference/reference-manual.xml	2005-08-25 13:43:06 UTC (rev 956)
@@ -1137,14 +1137,6 @@
 
     <section>
 
-      <title>Deployment step-by-step for Sun Java System Portal Server</title>
-
-      <para>TODO write this later</para>
-
-    </section>
-
-    <section>
-
       <title>General server configuration</title>
 
       <para>

[Jboss-svn-commits] JBL Code SVN: r955 - in trunk/forge/portal-extensions/forge-wiki/src: etc/org/jboss/wiki java/org/jboss/wiki java/org/jboss/wiki/plugins web/WEB-INF/jsp

[<jbo...@li...>]

Author: szimano
Date: 2005-08-25 08:30:24 -0400 (Thu, 25 Aug 2005)
New Revision: 955

Added:
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiSearch.java
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FindResultPlugin.java
Modified:
   trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.java
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java
   trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
Log:
search prototype


Modified: trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml	2005-08-24 22:14:20 UTC (rev 954)
+++ trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml	2005-08-25 12:30:24 UTC (rev 955)
@@ -33,4 +33,16 @@
 			<class>org.jboss.wiki.plugins.DiffPlugin</class>
 		</plugin>
 	</wikiType>
+	<wikiType>
+		<name>FIND</name>
+		<class>org.jboss.wiki.plugins.DefaultWikiType</class>
+		<plugin>
+			<name>findResult</name>
+			<class>org.jboss.wiki.plugins.FindResultPlugin</class>
+		</plugin>
+		<plugin>
+			<name>wikiToHtmlTranslator</name>
+			<class>org.jboss.wiki.plugins.HTMLTranslator</class>
+		</plugin>
+	</wikiType>
 </wikiTypes>
\ No newline at end of file

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java	2005-08-24 22:14:20 UTC (rev 954)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/FileDataSource.java	2005-08-25 12:30:24 UTC (rev 955)
@@ -63,8 +63,7 @@
 			pathToMedia = fileDSProps.getProperty("pathToMedia");
 			System.out.println("Path to media is: " + pathToMedia);
 			pathToAttachments = fileDSProps.getProperty("pathToAttachements");
-			System.out
-					.println("Path to attachements is: " + pathToAttachments);
+			System.out.println("Path to attachements is: " + pathToAttachments);
 		} else {
 			System.err
 					.println("Your properties file lacks of pathToMedia property. It will not run properly ! Please update "
@@ -198,16 +197,21 @@
 
 	public Properties getPageProps(String pageName) {
 		Properties pageProps = new Properties();
-
+		
 		try {
-			pageProps.load(new FileInputStream(new File(pathToMedia + "/OLD/"
-					+ pageName + "/page.properties")));
+			FileInputStream fpi = new FileInputStream(new File(pathToMedia + "/OLD/"
+					+ pageName + "/page.properties"));
+			pageProps.load(fpi);
+			fpi.close();
 		} catch (IOException ioe) {
-			System.err.println("Cannot read page.properties for page: "
-					+ pageName + " file: " + pathToMedia + "/OLD/" + pageName
-					+ "/page.properties\n" + ioe);
+			//TODO make file structure if this happens
+			
+			//System.err.println("Cannot read page.properties for page: "
+			//		+ pageName + " file: " + pathToMedia + "/OLD/" + pageName
+			//		+ "/page.properties\n" + ioe);
 			return null;
 		}
+	
 
 		return pageProps;
 	}
@@ -222,7 +226,7 @@
 			// create dirs for this property file
 			propFile.mkdirs();
 		}
-		
+
 		propFile = new File(pathToAttachments + "/" + pageName + "-att/"
 				+ attName + "-dir/attachment.properties");
 
@@ -260,8 +264,8 @@
 	}
 
 	public WikiPage getPage(String pageName) {
-		System.out.println("[WIKI:FileDataSource]: Getting new page: "
-				+ pageName);
+		// System.out.println("[WIKI:FileDataSource]: Getting new page: " +
+		// pageName);
 
 		WikiPage page = null;
 
@@ -283,7 +287,7 @@
 				Credentials author = new Credentials(pageProps
 						.getProperty(String.valueOf(i) + ".author"));
 
-				String pageContent = "";
+				StringBuilder pageContent = new StringBuilder();
 
 				try {
 					FileInputStream input = new FileInputStream(pageFile);
@@ -291,19 +295,20 @@
 					int nextChr = input.read();
 
 					while (nextChr != -1) {
-						pageContent += (char) nextChr;
+						pageContent.append((char) nextChr);
 						nextChr = input.read();
 					}
 				} catch (IOException ioe) {
 					System.err.println(ioe);
 				}
 
-				page = new WikiPage(pageName, author, pageContent, i, i,
-						new Date(pageFile.lastModified()), this);
+				page = new WikiPage(pageName, author, pageContent.toString(),
+						i, i, new Date(pageFile.lastModified()), this);
 
 				page.setLength(pageFile.length());
 			}
 		}
+		
 
 		return page;
 
@@ -382,7 +387,7 @@
 
 	public void getContentAtVersion(WikiPage page, boolean loadContent,
 			int version) {
-		String ret = null;
+		StringBuilder ret = null;
 
 		File pageFile = new File(pathToMedia + "/OLD/" + page.getName() + "/"
 				+ version + ".txt");
@@ -393,14 +398,14 @@
 
 				int nextChr = input.read();
 
-				ret = "";
+				ret = new StringBuilder();
 
 				while (nextChr != -1) {
-					ret += (char) nextChr;
+					ret.append((char) nextChr);
 					nextChr = input.read();
 				}
 
-				page.setPageContent(ret);
+				page.setPageContent(ret.toString());
 				page.setLength(ret.length());
 
 			} catch (IOException ioe) {
@@ -439,7 +444,8 @@
 		}
 	}
 
-	public void addAtachement(File attFile, String attName, WikiPage page, String user) {
+	public void addAtachement(File attFile, String attName, WikiPage page,
+			String user) {
 		String pageName = page.getName();
 		Properties attProps = getAttProps(pageName, attName);
 
@@ -491,36 +497,57 @@
 				System.err.println(e);
 			}
 		}
-		
+
 		// at the end delete the temp file
 		attFile.delete();
-		
+
 		attProps.setProperty(lastVersion + ".author", user);
-		
+
 		saveAttProps(attProps, pageName, attName);
 	}
 
 	public Set<String> getAttachementsSet(WikiPage page) {
 		Set<String> attSet = new HashSet<String>();
-		
-		File attDir = new File(pathToAttachments+"/"+page.getName()+"-att");
-		
+
+		File attDir = new File(pathToAttachments + "/" + page.getName()
+				+ "-att");
+
 		if (attDir.exists()) {
 			File[] attachements = attDir.listFiles();
-			
+
 			for (int i = 0; i < attachements.length; i++) {
-				if ((attachements[i].isDirectory())&&(attachements[i].getName().endsWith("-dir"))) {
+				if ((attachements[i].isDirectory())
+						&& (attachements[i].getName().endsWith("-dir"))) {
 					String[] tokens = attachements[i].getName().split("/");
-					attSet.add(tokens[tokens.length - 1].substring(0, tokens[tokens.length - 1].length()-4));
+					attSet.add(tokens[tokens.length - 1].substring(0,
+							tokens[tokens.length - 1].length() - 4));
 				}
 			}
-		}
-		else {
+		} else {
 			// page has no attachements
 			return null;
 		}
-		
+
 		return attSet;
 	}
 
+	public Set<String> getAllPageNames() {
+		Set<String> attSet = new HashSet<String>();
+
+		File attDir = new File(pathToMedia + "/");
+
+		File[] pageFiles = attDir.listFiles();
+
+		for (int i = 0; i < pageFiles.length; i++) {
+			if ((pageFiles[i].isFile())
+					&& (pageFiles[i].getName().endsWith(".txt"))) {
+				String[] tokens = pageFiles[i].getName().split("/");
+				attSet.add(tokens[tokens.length - 1].substring(0,
+						tokens[tokens.length - 1].length() - 4));
+			}
+		}
+
+		return attSet;
+	}
+
 }

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.java	2005-08-24 22:14:20 UTC (rev 954)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/MediaDataSource.java	2005-08-25 12:30:24 UTC (rev 955)
@@ -92,6 +92,8 @@
     public void addAtachement(File attFile, String attName, WikiPage page, String user);
     
     public Set<String> getAttachementsSet(WikiPage page);
+    
+    public Set<String> getAllPageNames();
 }
 
 

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java	2005-08-24 22:14:20 UTC (rev 954)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiEngine.java	2005-08-25 12:30:24 UTC (rev 955)
@@ -10,10 +10,12 @@
 
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Set;
+import java.util.TreeSet;
+
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-
 /**
  * 
  * @author <a href="mailto:ds...@jb...">Damon Sicore</a>
@@ -39,6 +41,8 @@
 
 	private MediaDataSource mediaDataSource;
 
+	WikiPage noSuchPage;
+
 	/**
 	 * <p>
 	 * Does ...
@@ -69,9 +73,9 @@
 		// your code here
 		return false;
 	}
-	
+
 	public boolean pageExists(String pageName) {
-		
+
 		return mediaDataSource.pageExists(pageName);
 	}
 
@@ -101,7 +105,7 @@
 	 * @param wikiContext
 	 */
 	public WikiPage getByName(String pageName, WikiContext wikiContext) {
-	
+
 		WikiPage ret = null;
 
 		if (pages.containsKey(pageName)) {
@@ -119,14 +123,26 @@
 				return ret;
 			}
 		} else {
-			return null;
+			try {
+				ret = (WikiPage) noSuchPage.clone();
+				ret.setName(pageName);
+			} catch (CloneNotSupportedException cne) {
+				System.err.println(cne);
+
+			}
+			if (wikiContext != null) {
+				return wikiContext.process(ret);
+			} else {
+				return ret;
+			}
 		}
 	}
-	
-	public WikiPage getByName(String pageName, WikiContext wikiContext, int version) {
-		
+
+	public WikiPage getByName(String pageName, WikiContext wikiContext,
+			int version) {
+
 		WikiPage ret = null;
-		
+
 		if (pages.containsKey(pageName)) {
 			ret = pages.get(pageName);
 		} else {
@@ -134,9 +150,9 @@
 
 			pages.put(pageName, ret);
 		}
-		
+
 		ret = ret.getPageAtVersion(true, version);
-		
+
 		if (ret != null) {
 			if (wikiContext != null) {
 				return wikiContext.process(ret);
@@ -144,6 +160,18 @@
 				return ret;
 			}
 		} else {
+			// return noSuchPage if there isn't any
+			/*try {
+				ret = (WikiPage) noSuchPage.clone();
+			} catch (CloneNotSupportedException cne) {
+				System.err.println(cne);
+
+			}
+			if (wikiContext != null) {
+				return wikiContext.process(ret);
+			} else {
+				return ret;
+			}*/
 			return null;
 		}
 	}
@@ -161,6 +189,10 @@
 		pages = new HashMap<String, WikiPage>();
 		wikiTypes = new HashMap<String, WikiType>();
 
+		noSuchPage = new WikiPage("", new Credentials(""),
+				"There is no such page. Click on EDIT to start it.", 0, 0,
+				null, mediaDataSource);
+
 		loadWikiTypes();
 	}
 
@@ -175,7 +207,7 @@
 	protected void loadWikiTypes() {
 		try {
 			wikiTypes.clear();
-			
+
 			SAXParser sp = (SAXParserFactory.newInstance()).newSAXParser();
 			sp.parse(
 					WikiTypeHandler.class.getResourceAsStream("WikiTypes.xml"),
@@ -300,11 +332,32 @@
 
 		System.out.println(wp.getContent());
 	}
-	
+
 	public void refreshPage(String pageName) {
 		if (pages.containsKey(pageName)) {
 			pages.remove(pageName);
 		}
 	}
 
+	public Set<String> findPages(String searchQuery) {
+		System.out.println("Starting search: " + searchQuery);
+		WikiSearch wikiSearch = new WikiSearch(searchQuery);
+
+		Set<String> resPages = new TreeSet<String>();
+
+		Set<String> pages = getMediaDataSource().getAllPageNames();
+
+		for (String name : pages) {
+			WikiPage temp = getByName(name, null);
+			if (temp != null) {
+				if (wikiSearch.matches(temp.getPageContent().toLowerCase())) {
+					resPages.add(name);
+				}
+			}
+		}
+
+		System.out.println("Search completed");
+		return resPages;
+	}
+
 }

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java	2005-08-24 22:14:20 UTC (rev 954)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java	2005-08-25 12:30:24 UTC (rev 955)
@@ -14,6 +14,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
+import java.util.Set;
 
 import javax.portlet.*;
 import org.jboss.portlet.*;
@@ -111,6 +112,21 @@
 			}
 		}
 
+		if (rReq.getParameter("page") != null) {
+			rResp.setRenderParameter("page", rReq.getParameter("page"));
+
+		}
+		
+		if (rReq.getParameter("searchQuery") != null) {
+			//TODO do it man !
+			Set<String> pages = wikiEngine.findPages(rReq.getParameter("searchQuery"));
+
+			rReq.getPortletSession().setAttribute("findResult", pages);
+			
+			// show the results
+			rResp.setRenderParameter("page", "FindResult");
+		}
+		
 		if (rReq.getParameter("action") != null) {
 			rResp.setRenderParameter("action", rReq.getParameter("action"));
 		}
@@ -126,11 +142,6 @@
 			rResp.setRenderParameter("version", rReq.getParameter("version"));
 		}
 
-		if (rReq.getParameter("page") != null) {
-			rResp.setRenderParameter("page", rReq.getParameter("page"));
-
-		}
-
 		if (rReq.getParameter("editAction") != null) {
 			System.out.println("EDITING PAGE");
 

Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiSearch.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiSearch.java	2005-08-24 22:14:20 UTC (rev 954)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiSearch.java	2005-08-25 12:30:24 UTC (rev 955)
@@ -0,0 +1,77 @@
+package org.jboss.wiki;
+
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+public class WikiSearch {
+	Vector<String> requestTokens;
+	Vector<String> forbiddenTokens;
+	Vector<String> requiredTokens;
+	
+	public WikiSearch(String searchQuery) {
+		requestTokens = new Vector<String>();
+		forbiddenTokens = new Vector<String>();
+		requiredTokens = new Vector<String>();
+		
+        StringTokenizer st = new StringTokenizer( searchQuery, " \t," );
+
+
+        //
+        //  Parse incoming search string
+        //
+
+        while( st.hasMoreTokens() )
+        {
+            String token = st.nextToken().toLowerCase();
+
+
+            switch( token.charAt(0) )
+            {
+              case '+':
+                token = token.substring(1);
+                requiredTokens.add(token);
+                break;
+                
+              case '-':
+            	token = token.substring(1);
+                forbiddenTokens.add(token);
+                break;
+
+              default:
+                requestTokens.add(token);
+                break;
+            }
+        }
+	}
+	
+	public boolean matches(String content) {
+		for (int i = 0; i < forbiddenTokens.size(); i++) {
+			if (content.indexOf(forbiddenTokens.get(i)) != -1) {
+				// there is forbidden token
+				return false;
+			}
+		}
+		
+		for (int i = 0; i < requiredTokens.size(); i++) {
+			if (content.indexOf(requiredTokens.get(i)) == -1) {
+				// lack of one of the required tokens
+				return false;
+			}
+		}
+		
+		if (requiredTokens.size() > 0) {
+			// there is at least one requirted token and it has been found
+			return true;
+		}
+		
+		for (int i = 0; i < requestTokens.size(); i++) {
+			if (content.indexOf(requestTokens.get(i)) != -1) {
+				// found at least one required token
+				return true;
+			}
+		}
+		
+		// didn't found anything that fits
+		return false;
+	}
+}

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java	2005-08-24 22:14:20 UTC (rev 954)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiType.java	2005-08-25 12:30:24 UTC (rev 955)
@@ -86,6 +86,7 @@
 			System.out.println("cannot clone the page: " + cnse);
 		}
 		
+		// execute the plugins
 		for (int i = 0; i < plugins.size(); i++) {
 			System.out.println("Executing plugin: "+plugins.get(i).getName());
 			newPage = (plugins.get(i)).process(newPage, wikiSession);

Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FindResultPlugin.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FindResultPlugin.java	2005-08-24 22:14:20 UTC (rev 954)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FindResultPlugin.java	2005-08-25 12:30:24 UTC (rev 955)
@@ -0,0 +1,45 @@
+package org.jboss.wiki.plugins;
+
+import java.util.Set;
+
+import org.jboss.wiki.WikiPage;
+import org.jboss.wiki.WikiPlugin;
+import org.jboss.wiki.WikiSession;
+
+public class FindResultPlugin extends WikiPlugin {
+
+	@Override
+	public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) {
+		WikiPage newPage = null;
+
+		try {
+			newPage = (WikiPage) wikiPage.clone();
+		} catch (CloneNotSupportedException cl) {
+			System.err.println(cl);
+		}
+
+		Set<String> pages = (Set<String>) wikiSession
+				.getAttribute("findResult");
+
+		StringBuilder pageStr = new StringBuilder("!!!__Find results:__\n");
+
+		if (pages.size() == 0) {
+			pageStr.append("''NONE FOUND''");
+		} else {
+			for (String p : pages) {
+				pageStr.append("[").append(p).append("]").append("\\\\\n");
+			}
+		}
+
+		newPage.setPageContent(pageStr.toString());
+
+		return newPage;
+	}
+
+	@Override
+	public void init() {
+		// TODO Auto-generated method stub
+
+	}
+
+}

Modified: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp	2005-08-24 22:14:20 UTC (rev 954)
+++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp	2005-08-25 12:30:24 UTC (rev 955)
@@ -13,6 +13,7 @@
 	String wikiPage = (String)request.getAttribute("wikiPage");
 	String defaultPage = (String)request.getAttribute("defaultPage");
 	String firendlyLink = (String)request.getAttribute("firendlyLink");
+	String type = (String)request.getParameter("type");
 	java.util.Date editDate = (java.util.Date)request.getAttribute("editDate");
 	org.jboss.wiki.Credentials author = (org.jboss.wiki.Credentials)request.getAttribute("author");
 %>
@@ -21,7 +22,7 @@
 
 <!--<a href="<%=actionURL%>&page=<%=defaultPage%>"><%=defaultPage%></a><br />-->
 
-<!--<form method="post" action="<%=actionURL%>">-->
+<form method="post" action="<%=actionURL%>&type=FIND">
 <table style="width: 100%" border="0">
 <tr style="vertical-align: bottom;">
 <td style="vertical-align: bottom; align-bottom: 0px;">
@@ -34,24 +35,30 @@
 	String logedIn = (String)request.getAttribute("logedIn");
 
 
-	if (logedIn.equals("true")) {
-		out.print("<a href='"+actionURL+"&action=Edit&page="+wikiPage+"'><img alt=\"EDIT\" src=\"/file-access/default/members/jbosswiki/images/editButton.png\"</img></a>\n"+
-				  "<a href=\""+actionURL+"&action=Attach\"><img alt=\"ATTACH\" src=\"/file-access/default/members/jbosswiki/images/attachButton.png\"</img></a>");
-
+	if ((type == null)||(type.equals("HTML"))) {
+		if (logedIn.equals("true")) {
+			out.print("<a href='"+actionURL+"&action=Edit&page="+wikiPage+"'><img alt=\"EDIT\" src=\"/file-access/default/members/jbosswiki/images/editButton.png\"</img></a>\n"+
+					  "<a href=\""+actionURL+"&action=Attach\"><img alt=\"ATTACH\" src=\"/file-access/default/members/jbosswiki/images/attachButton.png\"</img></a>");
+	
+		}
+		else {
+			out.print("<div style='font-size: xx-small'><i>Login to edit pages and attach files</i></div>");
+		}
 	}
-	else {
-		out.print("<div style='font-size: xx-small'><i>Login to edit pages and attach files</i></div>");
-	}
 
 %>
 
- <a href="<%=actionURL%>&action=Info&page=<%=wikiPage%>"><img alt="HISTORY" src="/file-access/default/members/jbosswiki/images/historyButton.png"</img></a><br />
-<!--<input type="text" name="page" />
-<input type="submit" value="GO" />-->
+<%
+if ((type == null)||(type.equals("HTML"))) {
+ out.println("<a href=\""+actionURL+"&action=Info&page="+wikiPage+"\"><img alt=\"HISTORY\" src=\"/file-access/default/members/jbosswiki/images/historyButton.png\"</img></a><br />");
+ }
+ %>
+<input type="text" name="searchQuery" />
+<input type="submit" value="SEARCH" />
 </td>
 </tr>
 </table>
-<!--</form>-->
+</form>
 
 <hr />
 
@@ -86,9 +93,9 @@
 	}
 %>
 
-<table style="width: 100%">
-<tr>
-<td class="wikiContent"><%=wikiContent%><td>
+<table style="width: 100%; margin: 0px; padding: 0px;">
+<tr style="width: 100%; margin: 0px; padding: 0px;">
+<td style="width: 100%; margin: 0px; padding: 0px;"><%=wikiContent%><td>
 </tr>
 <tr>
 <td class="wikiFooter">
@@ -101,5 +108,10 @@
 </tr>
 </table>
 <br />
-<div class="author">The page last changed on <%=editDate%> by <%=author%>. </div>
 
+<%
+if ((type == null)||(type.equals("HTML"))) {
+	out.println("<div>The page last changed on "+editDate+" by "+author+". </div>");
+}
+%>
+

[Jboss-svn-commits] JBL Code SVN: r954 - trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp

[<jbo...@li...>]

Author: szimano
Date: 2005-08-24 18:14:20 -0400 (Wed, 24 Aug 2005)
New Revision: 954

Modified:
   trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
Log:
go box taken out


Modified: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp	2005-08-24 21:28:03 UTC (rev 953)
+++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp	2005-08-24 22:14:20 UTC (rev 954)
@@ -21,7 +21,7 @@
 
 <!--<a href="<%=actionURL%>&page=<%=defaultPage%>"><%=defaultPage%></a><br />-->
 
-<form method="post" action="<%=actionURL%>">
+<!--<form method="post" action="<%=actionURL%>">-->
 <table style="width: 100%" border="0">
 <tr style="vertical-align: bottom;">
 <td style="vertical-align: bottom; align-bottom: 0px;">
@@ -46,12 +46,12 @@
 %>
 
  <a href="<%=actionURL%>&action=Info&page=<%=wikiPage%>"><img alt="HISTORY" src="/file-access/default/members/jbosswiki/images/historyButton.png"</img></a><br />
-<input type="text" name="page" />
-<input type="submit" value="GO" />
+<!--<input type="text" name="page" />
+<input type="submit" value="GO" />-->
 </td>
 </tr>
 </table>
-</form>
+<!--</form>-->
 
 <hr />
 

[Jboss-svn-commits] JBL Code SVN: r953 - in qa/forge/portal-extensions: . forge-wiki/src/etc/org/jboss/wiki

[<jbo...@li...>]

Author: dam...@jb...
Date: 2005-08-24 17:28:03 -0400 (Wed, 24 Aug 2005)
New Revision: 953

Added:
   qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample
Removed:
   qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties
Modified:
   qa/forge/portal-extensions/maven.xml
Log:
MERGED: -r 950:952 https://svn.labs.jboss.com/trunk/forge/portal-extensions into qa portal-extensions.

Deleted: qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties
===================================================================
--- qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties	2005-08-24 21:04:29 UTC (rev 952)
+++ qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties	2005-08-24 21:28:03 UTC (rev 953)
@@ -1,8 +0,0 @@
-# WikiPlugin properties. Use it wise.
-#specifies base URL for the portal
-htmlTranslatorURL = http://forge.sicore.org:8080/
-#htmlTranslatorURL = http://localhost:8080/
-#extensions for images to be inlined, coma-separated
-imagePatterns = .png , .jpeg , .gif , .bmp 
-#wikiHome part of url. Leave it you use default portlet conifguration
-wikiHome = index.html?ctrl:id=window.default.WikiPortletWindow&ctrl:type=action

Copied: qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample (from rev 952, trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample)

Modified: qa/forge/portal-extensions/maven.xml
===================================================================
--- qa/forge/portal-extensions/maven.xml	2005-08-24 21:04:29 UTC (rev 952)
+++ qa/forge/portal-extensions/maven.xml	2005-08-24 21:28:03 UTC (rev 953)
@@ -116,6 +116,7 @@
 3. blojsom/to-copy/blojsom.war/WEB-INF/blojsom.properties
 4. forge-login/to-copy/portal-login-ds.xml
 5. federation-register/src/web/WEB-INF/faces-config (only for the JOSF portal).
+6. forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample (change htmlTranslatorURL to your url)
 
 Available goals:
 - help - prints this info

[Jboss-svn-commits] JBL Code SVN: r952 - in qa/forge/portal-extensions: forge-common/src/etc/org/jboss/forge/common forge-portal-attr forge-wiki/src/etc/org/jboss/wiki forge-wiki/src/java/org/jboss/wiki forge-wiki/src/java/org/jboss/wiki/plugins forge-wiki/src/web/WEB-INF/jsp

[<jbo...@li...>]

Author: dam...@jb...
Date: 2005-08-24 17:04:29 -0400 (Wed, 24 Aug 2005)
New Revision: 952

Added:
   qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java
Modified:
   qa/forge/portal-extensions/forge-common/src/etc/org/jboss/forge/common/forge.properties.sample
   qa/forge/portal-extensions/forge-portal-attr/maven.xml
   qa/forge/portal-extensions/forge-portal-attr/project.xml
   qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml
   qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java
   qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
   qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java
   qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/DiffPlugin.java
   qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/TrailPlugin.java
   qa/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
Log:
MERGED: -r 943:950 https://svn.labs.jboss.com/trunk/forge/portal-extensions into qa portal-extensions.

Modified: qa/forge/portal-extensions/forge-common/src/etc/org/jboss/forge/common/forge.properties.sample
===================================================================
--- qa/forge/portal-extensions/forge-common/src/etc/org/jboss/forge/common/forge.properties.sample	2005-08-24 20:48:25 UTC (rev 951)
+++ qa/forge/portal-extensions/forge-common/src/etc/org/jboss/forge/common/forge.properties.sample	2005-08-24 21:04:29 UTC (rev 952)
@@ -1,13 +1,23 @@
 # Path to a svn repository from which content will be checked out.
+# example:
+#   svnpath=https://cms.labs.jboss.com/trunk/forge/portal-content
 svnpath=
 # Authorization for the svn repo.
 svnusername=
 svnpassword=
 # Local path to where the content will be checked out.
+# example: 
+#   localpath=/usr/local/forge/portal/content
 localpath=
 # Local path where blojsom stores the entries.
+# example: 
+#   blogpath=/usr/local/forge/portal/blog
 blogpath=
 # Address of an smtp server used for sending e-mails.
+# example:
+#  smtpserver=localhost
 smtpserver=
 # E-mail address of "contributor's applications" administrator
+# example:
+#   smt...@jb...
 contribadmin=

Modified: qa/forge/portal-extensions/forge-portal-attr/maven.xml
===================================================================
--- qa/forge/portal-extensions/forge-portal-attr/maven.xml	2005-08-24 20:48:25 UTC (rev 951)
+++ qa/forge/portal-extensions/forge-portal-attr/maven.xml	2005-08-24 21:04:29 UTC (rev 952)
@@ -4,6 +4,9 @@
   See terms of license at gnu.org. 
  -->
 <project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
+	<goal name="prj-install">
+	</goal>
+
 	<goal name="all">
 	</goal>
 

Modified: qa/forge/portal-extensions/forge-portal-attr/project.xml
===================================================================
--- qa/forge/portal-extensions/forge-portal-attr/project.xml	2005-08-24 20:48:25 UTC (rev 951)
+++ qa/forge/portal-extensions/forge-portal-attr/project.xml	2005-08-24 21:04:29 UTC (rev 952)
@@ -34,4 +34,4 @@
     <build>
 	<sourceDirectory>src/java</sourceDirectory>
     </build>
-</project>
\ No newline at end of file
+</project>

Modified: qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml
===================================================================
--- qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml	2005-08-24 20:48:25 UTC (rev 951)
+++ qa/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml	2005-08-24 21:04:29 UTC (rev 952)
@@ -20,6 +20,10 @@
 			<name>attachmentList</name>
 			<class>org.jboss.wiki.plugins.AttachmentListPlugin</class>
 		</plugin>
+		<plugin>
+			<name>friendlyLinks</name>
+			<class>org.jboss.wiki.plugins.FriendlyLinkPlugin</class>
+		</plugin>
 	</wikiType>
 	<wikiType>
 		<name>DIFF</name>

Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java
===================================================================
--- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java	2005-08-24 20:48:25 UTC (rev 951)
+++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java	2005-08-24 21:04:29 UTC (rev 952)
@@ -50,11 +50,6 @@
  * 
  * @return 
  */
-    public abstract void next();
-/**
- * <p></p>
- * 
- */
     
     public abstract void init();
     

Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
===================================================================
--- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java	2005-08-24 20:48:25 UTC (rev 951)
+++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java	2005-08-24 21:04:29 UTC (rev 952)
@@ -9,9 +9,11 @@
 package org.jboss.wiki;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Properties;
 
 import javax.portlet.*;
 import org.jboss.portlet.*;
@@ -183,6 +185,7 @@
 	public void doView(JBossRenderRequest rReq, JBossRenderResponse rRes)
 			throws PortletException, java.io.IOException {
 
+		
 		WikiPage noSuchPage = new WikiPage("", new Credentials(""),
 				"There is no such page. Click on EDIT to start it.", 0, 0,
 				null, wikiEngine.getMediaDataSource());
@@ -334,6 +337,13 @@
 		
 		rReq.setAttribute("defaultPage", defaultPage);
 
+		// FIXME make this more elegant (ie. plugin)
+		// pass friendly link
+		Properties props = new Properties();
+		props.load(WikiPlugin.class.getResourceAsStream("wikiPlugins.properties"));
+		rReq.setAttribute("firendlyLink", props.getProperty("htmlTranslatorURL")+"wiki/"+pageToShow.getName());
+		
+			
 		rRes.setTitle("Wiki");
 		if (javax.portlet.WindowState.NORMAL.equals(rReq.getWindowState())
 				|| javax.portlet.WindowState.MAXIMIZED.equals(rReq

Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java
===================================================================
--- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java	2005-08-24 20:48:25 UTC (rev 951)
+++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java	2005-08-24 21:04:29 UTC (rev 952)
@@ -47,12 +47,7 @@
 		return newPage;
 	}
 
-	@Override
-	public void next() {
-		// TODO Auto-generated method stub
 
-	}
-
 	@Override
 	public void init() {
 		host = getProperty("htmlTranslatorURL")+"wiki/";

Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/DiffPlugin.java
===================================================================
--- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/DiffPlugin.java	2005-08-24 20:48:25 UTC (rev 951)
+++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/DiffPlugin.java	2005-08-24 21:04:29 UTC (rev 952)
@@ -36,11 +36,6 @@
 	}
 
 	@Override
-	public void next() {
-		
-	}
-
-	@Override
 	public void init() {
 		differenceEngine = new DifferenceEngine("ISO-8859-1");
 

Copied: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java (from rev 950, trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java)

Modified: qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/TrailPlugin.java
===================================================================
--- qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/TrailPlugin.java	2005-08-24 20:48:25 UTC (rev 951)
+++ qa/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/TrailPlugin.java	2005-08-24 21:04:29 UTC (rev 952)
@@ -37,12 +37,6 @@
 	}
 
 	@Override
-	public void next() {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
 	public void init() {
 		// TODO Auto-generated method stub
 

Modified: qa/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
===================================================================
--- qa/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp	2005-08-24 20:48:25 UTC (rev 951)
+++ qa/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp	2005-08-24 21:04:29 UTC (rev 952)
@@ -12,6 +12,7 @@
 	String wikiContent = (String)request.getAttribute("wikiContent");
 	String wikiPage = (String)request.getAttribute("wikiPage");
 	String defaultPage = (String)request.getAttribute("defaultPage");
+	String firendlyLink = (String)request.getAttribute("firendlyLink");
 	java.util.Date editDate = (java.util.Date)request.getAttribute("editDate");
 	org.jboss.wiki.Credentials author = (org.jboss.wiki.Credentials)request.getAttribute("author");
 %>
@@ -19,8 +20,15 @@
 <h2><a href="<%=actionURL%>&page=<%=defaultPage%>"><%=wikiName%></a>/ <%=wikiPage%> </h2>
 
 <!--<a href="<%=actionURL%>&page=<%=defaultPage%>"><%=defaultPage%></a><br />-->
-<div style="text-align: right;">
 
+<form method="post" action="<%=actionURL%>">
+<table style="width: 100%" border="0">
+<tr style="vertical-align: bottom;">
+<td style="vertical-align: bottom; align-bottom: 0px;">
+<div><a href="<%=firendlyLink%>"><img  style="vertical-align: middle" alt="PERM LINK" src="/file-access/default/members/jbosswiki/images/permaLinkButton.png" /></a> <a href="<%=firendlyLink%>"><%=firendlyLink%></a></div>
+</td>
+<td style="text-align: right;vertical-align: bottom; align-bottom: 0px;">
+
 <%
 
 	String logedIn = (String)request.getAttribute("logedIn");
@@ -32,17 +40,18 @@
 
 	}
 	else {
-		out.print("<i><div style='font-size: xx-small'>Login to edit pages and attach files</div></i>");
+		out.print("<div style='font-size: xx-small'><i>Login to edit pages and attach files</i></div>");
 	}
 
 %>
 
- <a href="<%=actionURL%>&action=Info&page=<%=wikiPage%>"><img alt="HISTORY" src="/file-access/default/members/jbosswiki/images/historyButton.png"</img></a>
-<form method="post" action="<%=actionURL%>">
+ <a href="<%=actionURL%>&action=Info&page=<%=wikiPage%>"><img alt="HISTORY" src="/file-access/default/members/jbosswiki/images/historyButton.png"</img></a><br />
 <input type="text" name="page" />
 <input type="submit" value="GO" />
+</td>
+</tr>
+</table>
 </form>
-</div>
 
 <hr />
 

[Jboss-svn-commits] JBL Code SVN: r951 - in trunk/forge/portal-extensions: . forge-wiki/src/etc/org/jboss/wiki

[<jbo...@li...>]

Author: szimano
Date: 2005-08-24 16:48:25 -0400 (Wed, 24 Aug 2005)
New Revision: 951

Added:
   trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample
Removed:
   trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties
Modified:
   trunk/forge/portal-extensions/maven.xml
Log:
wikiplugins.props samplesized


Deleted: trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties	2005-08-24 20:41:17 UTC (rev 950)
+++ trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties	2005-08-24 20:48:25 UTC (rev 951)
@@ -1,8 +0,0 @@
-# WikiPlugin properties. Use it wise.
-#specifies base URL for the portal
-htmlTranslatorURL = http://forge.sicore.org:8080/
-#htmlTranslatorURL = http://localhost:8080/
-#extensions for images to be inlined, coma-separated
-imagePatterns = .png , .jpeg , .gif , .bmp 
-#wikiHome part of url. Leave it you use default portlet conifguration
-wikiHome = index.html?ctrl:id=window.default.WikiPortletWindow&ctrl:type=action

Copied: trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample (from rev 936, trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties)

Modified: trunk/forge/portal-extensions/maven.xml
===================================================================
--- trunk/forge/portal-extensions/maven.xml	2005-08-24 20:41:17 UTC (rev 950)
+++ trunk/forge/portal-extensions/maven.xml	2005-08-24 20:48:25 UTC (rev 951)
@@ -116,6 +116,7 @@
 3. blojsom/to-copy/blojsom.war/WEB-INF/blojsom.properties
 4. forge-login/to-copy/portal-login-ds.xml
 5. federation-register/src/web/WEB-INF/faces-config (only for the JOSF portal).
+6. forge-wiki/src/etc/org/jboss/wiki/wikiPlugins.properties.sample (change htmlTranslatorURL to your url)
 
 Available goals:
 - help - prints this info

[Jboss-svn-commits] JBL Code SVN: r950 - trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp

[<jbo...@li...>]

Author: szimano
Date: 2005-08-24 16:41:17 -0400 (Wed, 24 Aug 2005)
New Revision: 950

Modified:
   trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
Log:
middle perm button


Modified: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp	2005-08-24 20:36:11 UTC (rev 949)
+++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp	2005-08-24 20:41:17 UTC (rev 950)
@@ -25,7 +25,7 @@
 <table style="width: 100%" border="0">
 <tr style="vertical-align: bottom;">
 <td style="vertical-align: bottom; align-bottom: 0px;">
-<a href="<%=firendlyLink%>"><img alt="PERM LINK" src="/file-access/default/members/jbosswiki/images/permaLinkButton.png" /></a> <a href="<%=firendlyLink%>"><%=firendlyLink%></a>
+<div><a href="<%=firendlyLink%>"><img  style="vertical-align: middle" alt="PERM LINK" src="/file-access/default/members/jbosswiki/images/permaLinkButton.png" /></a> <a href="<%=firendlyLink%>"><%=firendlyLink%></a></div>
 </td>
 <td style="text-align: right;vertical-align: bottom; align-bottom: 0px;">
 

[Jboss-svn-commits] JBL Code SVN: r949 - trunk/forge/portal-extensions/forge-portal-attr

[<jbo...@li...>]

Author: adamw
Date: 2005-08-24 16:36:11 -0400 (Wed, 24 Aug 2005)
New Revision: 949

Modified:
   trunk/forge/portal-extensions/forge-portal-attr/maven.xml
   trunk/forge/portal-extensions/forge-portal-attr/project.xml
Log:
Fixed prj-install


Modified: trunk/forge/portal-extensions/forge-portal-attr/maven.xml
===================================================================
--- trunk/forge/portal-extensions/forge-portal-attr/maven.xml	2005-08-24 19:59:21 UTC (rev 948)
+++ trunk/forge/portal-extensions/forge-portal-attr/maven.xml	2005-08-24 20:36:11 UTC (rev 949)
@@ -4,6 +4,9 @@
   See terms of license at gnu.org. 
  -->
 <project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
+	<goal name="prj-install">
+	</goal>
+
 	<goal name="all">
 	</goal>
 

Modified: trunk/forge/portal-extensions/forge-portal-attr/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-portal-attr/project.xml	2005-08-24 19:59:21 UTC (rev 948)
+++ trunk/forge/portal-extensions/forge-portal-attr/project.xml	2005-08-24 20:36:11 UTC (rev 949)
@@ -34,4 +34,4 @@
     <build>
 	<sourceDirectory>src/java</sourceDirectory>
     </build>
-</project>
\ No newline at end of file
+</project>

[Jboss-svn-commits] JBL Code SVN: r948 - trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp

[<jbo...@li...>]

Author: szimano
Date: 2005-08-24 15:59:21 -0400 (Wed, 24 Aug 2005)
New Revision: 948

Modified:
   trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
Log:
perm link button


Modified: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp	2005-08-24 19:33:54 UTC (rev 947)
+++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp	2005-08-24 19:59:21 UTC (rev 948)
@@ -25,7 +25,7 @@
 <table style="width: 100%" border="0">
 <tr style="vertical-align: bottom;">
 <td style="vertical-align: bottom; align-bottom: 0px;">
-PERM LINK:<a href="<%=firendlyLink%>"><%=firendlyLink%></a>
+<a href="<%=firendlyLink%>"><img alt="PERM LINK" src="/file-access/default/members/jbosswiki/images/permaLinkButton.png" /></a> <a href="<%=firendlyLink%>"><%=firendlyLink%></a>
 </td>
 <td style="text-align: right;vertical-align: bottom; align-bottom: 0px;">
 

[Jboss-svn-commits] JBL Code SVN: r947 - in trunk/forge/portal-extensions/forge-wiki/src: etc/org/jboss/wiki java/org/jboss/wiki java/org/jboss/wiki/plugins web/WEB-INF/jsp

[<jbo...@li...>]

Author: szimano
Date: 2005-08-24 15:33:54 -0400 (Wed, 24 Aug 2005)
New Revision: 947

Added:
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java
Modified:
   trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/DiffPlugin.java
   trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/TrailPlugin.java
   trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
Log:
friendly links


Modified: trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml	2005-08-24 19:27:57 UTC (rev 946)
+++ trunk/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/WikiTypes.xml	2005-08-24 19:33:54 UTC (rev 947)
@@ -20,6 +20,10 @@
 			<name>attachmentList</name>
 			<class>org.jboss.wiki.plugins.AttachmentListPlugin</class>
 		</plugin>
+		<plugin>
+			<name>friendlyLinks</name>
+			<class>org.jboss.wiki.plugins.FriendlyLinkPlugin</class>
+		</plugin>
 	</wikiType>
 	<wikiType>
 		<name>DIFF</name>

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java	2005-08-24 19:27:57 UTC (rev 946)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPlugin.java	2005-08-24 19:33:54 UTC (rev 947)
@@ -50,11 +50,6 @@
  * 
  * @return 
  */
-    public abstract void next();
-/**
- * <p></p>
- * 
- */
     
     public abstract void init();
     

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java	2005-08-24 19:27:57 UTC (rev 946)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/WikiPortlet.java	2005-08-24 19:33:54 UTC (rev 947)
@@ -9,9 +9,11 @@
 package org.jboss.wiki;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Properties;
 
 import javax.portlet.*;
 import org.jboss.portlet.*;
@@ -183,6 +185,7 @@
 	public void doView(JBossRenderRequest rReq, JBossRenderResponse rRes)
 			throws PortletException, java.io.IOException {
 
+		
 		WikiPage noSuchPage = new WikiPage("", new Credentials(""),
 				"There is no such page. Click on EDIT to start it.", 0, 0,
 				null, wikiEngine.getMediaDataSource());
@@ -334,6 +337,13 @@
 		
 		rReq.setAttribute("defaultPage", defaultPage);
 
+		// FIXME make this more elegant (ie. plugin)
+		// pass friendly link
+		Properties props = new Properties();
+		props.load(WikiPlugin.class.getResourceAsStream("wikiPlugins.properties"));
+		rReq.setAttribute("firendlyLink", props.getProperty("htmlTranslatorURL")+"wiki/"+pageToShow.getName());
+		
+			
 		rRes.setTitle("Wiki");
 		if (javax.portlet.WindowState.NORMAL.equals(rReq.getWindowState())
 				|| javax.portlet.WindowState.MAXIMIZED.equals(rReq

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java	2005-08-24 19:27:57 UTC (rev 946)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java	2005-08-24 19:33:54 UTC (rev 947)
@@ -47,12 +47,7 @@
 		return newPage;
 	}
 
-	@Override
-	public void next() {
-		// TODO Auto-generated method stub
 
-	}
-
 	@Override
 	public void init() {
 		host = getProperty("htmlTranslatorURL")+"wiki/";

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/DiffPlugin.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/DiffPlugin.java	2005-08-24 19:27:57 UTC (rev 946)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/DiffPlugin.java	2005-08-24 19:33:54 UTC (rev 947)
@@ -36,11 +36,6 @@
 	}
 
 	@Override
-	public void next() {
-		
-	}
-
-	@Override
 	public void init() {
 		differenceEngine = new DifferenceEngine("ISO-8859-1");
 

Added: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java	2005-08-24 19:27:57 UTC (rev 946)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/FriendlyLinkPlugin.java	2005-08-24 19:33:54 UTC (rev 947)
@@ -0,0 +1,62 @@
+package org.jboss.wiki.plugins;
+
+import java.util.Vector;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.jboss.wiki.WikiPage;
+import org.jboss.wiki.WikiPlugin;
+import org.jboss.wiki.WikiSession;
+
+public class FriendlyLinkPlugin extends WikiPlugin {
+
+	private String url;
+	private String pattern;
+	
+	private String translateLinks(String content) {
+		//<a href="http://localhost:8080/portal/index.html?ctrl:id=window.default.WikiPortletWindow&ctrl:type=action&page=JBossWiki">
+		String newContent = content;
+		Vector<String> replaces = new Vector<String>();
+		
+		Matcher matcher = Pattern.compile(pattern).matcher(newContent);
+		
+		while (matcher.find()) {
+			String link = content.substring(matcher.start(), matcher.end());
+			replaces.add("<a href=\""+url+link.substring(link.lastIndexOf("&page=")+("&page=".length()), link.length()-2)+"\" >");
+		}
+		
+		for (int i = 0; i < replaces.size(); i++) {
+			matcher = Pattern.compile(pattern).matcher(newContent);
+			newContent = matcher.replaceFirst(replaces.get(i));
+		}
+		
+		//System.out.println(content);
+		
+		return newContent;
+	}
+	
+	@Override
+	public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) {
+		WikiPage newPage = null;
+
+		try {
+			newPage = (WikiPage) wikiPage.clone();
+		} catch (CloneNotSupportedException cl) {
+			System.err.println(cl);
+		}
+
+		newPage.setPageContent(translateLinks(newPage.getPageContent()));
+
+		return newPage;
+	}
+
+	@Override
+	public void init() {
+		url = getProperty("htmlTranslatorURL")+"wiki/";
+		
+		pattern = "<a href=\""+((getProperty("htmlTranslatorURL")+"portal/"+getProperty("wikiHome")).replaceAll("\\.","\\\\.").replaceAll("\\?", "\\\\?"))+"&page=\\w+\">";
+		
+		System.out.println(pattern);
+	}
+
+}

Modified: trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/TrailPlugin.java
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/TrailPlugin.java	2005-08-24 19:27:57 UTC (rev 946)
+++ trunk/forge/portal-extensions/forge-wiki/src/java/org/jboss/wiki/plugins/TrailPlugin.java	2005-08-24 19:33:54 UTC (rev 947)
@@ -37,12 +37,6 @@
 	}
 
 	@Override
-	public void next() {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
 	public void init() {
 		// TODO Auto-generated method stub
 

Modified: trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp	2005-08-24 19:27:57 UTC (rev 946)
+++ trunk/forge/portal-extensions/forge-wiki/src/web/WEB-INF/jsp/Wiki.jsp	2005-08-24 19:33:54 UTC (rev 947)
@@ -12,6 +12,7 @@
 	String wikiContent = (String)request.getAttribute("wikiContent");
 	String wikiPage = (String)request.getAttribute("wikiPage");
 	String defaultPage = (String)request.getAttribute("defaultPage");
+	String firendlyLink = (String)request.getAttribute("firendlyLink");
 	java.util.Date editDate = (java.util.Date)request.getAttribute("editDate");
 	org.jboss.wiki.Credentials author = (org.jboss.wiki.Credentials)request.getAttribute("author");
 %>
@@ -19,8 +20,15 @@
 <h2><a href="<%=actionURL%>&page=<%=defaultPage%>"><%=wikiName%></a>/ <%=wikiPage%> </h2>
 
 <!--<a href="<%=actionURL%>&page=<%=defaultPage%>"><%=defaultPage%></a><br />-->
-<div style="text-align: right;">
 
+<form method="post" action="<%=actionURL%>">
+<table style="width: 100%" border="0">
+<tr style="vertical-align: bottom;">
+<td style="vertical-align: bottom; align-bottom: 0px;">
+PERM LINK:<a href="<%=firendlyLink%>"><%=firendlyLink%></a>
+</td>
+<td style="text-align: right;vertical-align: bottom; align-bottom: 0px;">
+
 <%
 
 	String logedIn = (String)request.getAttribute("logedIn");
@@ -32,17 +40,18 @@
 
 	}
 	else {
-		out.print("<i><div style='font-size: xx-small'>Login to edit pages and attach files</div></i>");
+		out.print("<div style='font-size: xx-small'><i>Login to edit pages and attach files</i></div>");
 	}
 
 %>
 
- <a href="<%=actionURL%>&action=Info&page=<%=wikiPage%>"><img alt="HISTORY" src="/file-access/default/members/jbosswiki/images/historyButton.png"</img></a>
-<form method="post" action="<%=actionURL%>">
+ <a href="<%=actionURL%>&action=Info&page=<%=wikiPage%>"><img alt="HISTORY" src="/file-access/default/members/jbosswiki/images/historyButton.png"</img></a><br />
 <input type="text" name="page" />
 <input type="submit" value="GO" />
+</td>
+</tr>
+</table>
 </form>
-</div>
 
 <hr />
 

[Jboss-svn-commits] JBL Code SVN: r946 - trunk/forge/portal-extensions/forge-common/src/etc/org/jboss/forge/common

[<jbo...@li...>]

Author: dam...@jb...
Date: 2005-08-24 15:27:57 -0400 (Wed, 24 Aug 2005)
New Revision: 946

Modified:
   trunk/forge/portal-extensions/forge-common/src/etc/org/jboss/forge/common/forge.properties.sample
Log:
Added sample entries to the foroge.properties.sample file.

Modified: trunk/forge/portal-extensions/forge-common/src/etc/org/jboss/forge/common/forge.properties.sample
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/etc/org/jboss/forge/common/forge.properties.sample	2005-08-24 18:15:28 UTC (rev 945)
+++ trunk/forge/portal-extensions/forge-common/src/etc/org/jboss/forge/common/forge.properties.sample	2005-08-24 19:27:57 UTC (rev 946)
@@ -1,13 +1,23 @@
 # Path to a svn repository from which content will be checked out.
+# example:
+#   svnpath=https://cms.labs.jboss.com/trunk/forge/portal-content
 svnpath=
 # Authorization for the svn repo.
 svnusername=
 svnpassword=
 # Local path to where the content will be checked out.
+# example: 
+#   localpath=/usr/local/forge/portal/content
 localpath=
 # Local path where blojsom stores the entries.
+# example: 
+#   blogpath=/usr/local/forge/portal/blog
 blogpath=
 # Address of an smtp server used for sending e-mails.
+# example:
+#  smtpserver=localhost
 smtpserver=
 # E-mail address of "contributor's applications" administrator
+# example:
+#   smt...@jb...
 contribadmin=

[Jboss-svn-commits] Mail delivery failed: returning message to sender

[Mail D. S. <Mai...@co...>]

This message was created automatically by mail delivery software.

A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

  jbo...@li...
    SMTP error from remote mailer after end of data:
    host 64.74.196.135 [64.74.196.135]: 552 5.6.0 Headers too large (32768 max)

------ This is a copy of the message, including all the headers. ------
------ The body of the message is 16459266 characters long; only the first
------ 106496 or so are included here.

Return-path: <jbo...@li...>
Received: from www-data by committer01.frg.pub.inap.atl.jboss.com with local (Exim 4.50)
	id 1E80CM-0000NL-QF
	for jbo...@li...; Wed, 24 Aug 2005 14:42:08 -0400
To: jbo...@li...
From: jbo...@li...
Subject: JBL Code SVN:  r945 - in qa/forge/portal-extensions: . binaries/maven-repo-addons/jboss/jars binaries/maven-repo-addons/tmate/jars blojsom federation-register federation-register/src/java/org/jboss/forge federation-register/src/web/WEB-INF forge-ads forge-blog forge-common forge-common/src/etc/org/jboss/forge/common forge-common/src/java/org/jboss/forge/common forge-common/src/java/org/jboss/forge/common/blog forge-common/src/java/org/jboss/forge/common/content forge-common/src/java/org/jboss/forge/common/portlet forge-common/src/java/org/jboss/forge/common/projects forge-common/src/java/org/jboss/forge/common/projects/elements forge-common/src/java/org/jboss/forge/common/service forge-common/src/java/org/jboss/forge/common/taglib forge-common/src/web/WEB-INF/tld forge-contributor forge-contributor/src forge-contributor/src/etc forge-contributor/src/java/org/jboss/forge/contributor forge-contributor/src/web/WEB-INF forge-contributor/src/web/WEB-INF/tld forge-ear for!
 ge-ear/src forge-ear/src/META-INF forge-file-access forge-file-access/src forge-file-access/src/etc forge-file-access/src/java/org/jboss/forge/fileaccess forge-file-access/src/web/WEB-INF forge-file-access/src/web/WEB-INF/tld forge-forums forge-forums/to-copy forge-forums/to-copy/portal-forums.ear forge-forums/to-copy/portal-forums.ear/META-INF forge-forums/to-copy/portal-forums.ear/portal-forums.sar forge-forums/to-copy/portal-forums.ear/portal-forums.sar/META-INF forge-forums/to-copy/portal-forums.ear/portal-forums.sar/conf forge-forums/to-copy/portal-forums.ear/portal-forums.sar/conf/hibernate forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl forge-info f!
 orge-jspwiki forge-login forge-map forge-navigation forge-navigation/s
rc/java/org/jbosslabs/portlet/navigation forge-navigation/src/web/WEB-INF forge-portal-attr forge-portal-attr/src forge-portal-attr/src/java forge-portal-attr/src/java/org forge-portal-attr/src/java/org/jboss forge-portal-attr/src/java/org/jboss/forge forge-portal-attr/src/java/org/jboss/forge/portal forge-portal-attr/to-copy forge-portal-attr/to-copy/jboss-portal.sar forge-portal-attr/to-copy/jboss-portal.sar/portal-server.war forge-portal-attr/to-copy/jboss-portal.sar/portal-server.war/WEB-INF forge-prj-blog forge-prj-docs forge-prj-docs/src/java/org/jboss/forge/projects/docs forge-prj-downloads forge-prj-freezone forge-prj-freezone/src/java/org/jboss/forge/projects/freezone forge-prj-info forge-root-redirect forge-root-redirect/src/web/WEB-INF forge-root-redirect/src/web/WEB-INF/tld forge-service forge-service/src forge-service/src/java forge-service/src/java/org forge-service/src/java/org/jboss forge-service/src/java/org/jboss/forge forge-service/src/java/org/jboss/forge!
 /service forge-theme forge-wiki forge-wiki/data forge-wiki/docs forge-wiki/src forge-wiki/src/etc forge-wiki/src/etc/org forge-wiki/src/etc/org/jboss forge-wiki/src/etc/org/jboss/wiki forge-wiki/src/etc/org/jboss/wiki/fileaccess forge-wiki/src/java forge-wiki/src/java/bmsi forge-wiki/src/java/bmsi/util forge-wiki/src/java/org forge-wiki/src/java/org/apache forge-wiki/src/java/org/apache/commons forge-wiki/src/java/org/apache/commons/fileupload forge-wiki/src/java/org/jboss forge-wiki/src/java/org/jboss/wiki forge-wiki/src/java/org/jboss/wiki/fileaccess forge-wiki/src/java/org/jboss/wiki/plugins forge-wiki/src/test forge-wiki/src/test/java forge-wiki/src/test/java/org forge-wiki/src/test/java/org/jboss forge-wiki/src/test/java/org/jboss/wiki forge-wiki/src/test/java/org/jboss/wiki/test forge-wiki/src/web forge-wiki/src/web/WEB-INF forge-wiki/src/web/WEB-INF/jsp forge-wiki/src/web/WEB-INF/tld jboss-as-binaries jboss-as-binaries/to-copy jboss-as-binaries/to-copy/bin jboss-as-b!
 inaries/to-copy/client jboss-as-binaries/to-copy/docs jboss-as-binarie
s/to-copy/docs/dtd jboss-as-binaries/to-copy/docs/examples jboss-as-binaries/to-copy/docs/examples/binding-manager jboss-as-binaries/to-copy/docs/examples/jboss.net jboss-as-binaries/to-copy/docs/examples/jboss.net/jboss-net.sar jboss-as-binaries/to-copy/docs/examples/jboss.net/jboss-net.sar/META-INF jboss-as-binaries/to-copy/docs/examples/jboss.net/jboss-net.sar/jboss-net.war jboss-as-binaries/to-copy/docs/examples/jboss.net/jboss-net.sar/jboss-net.war/META-INF jboss-as-binaries/to-copy/docs/examples/jboss.net/jboss-net.sar/jboss-net.war/WEB-INF jboss-as-binaries/to-copy/docs/examples/jboss.net/jboss-net.sar/jboss-net.war/images jboss-as-binaries/to-copy/docs/examples/jboss.net/jboss-net.sar/jmx-net.wsr jboss-as-binaries/to-copy/docs/examples/jboss.net/jboss-net.sar/jmx-net.wsr/META-INF jboss-as-binaries/to-copy/docs/examples/jca jboss-as-binaries/to-copy/docs/examples/jms jboss-as-binaries/to-copy/docs/examples/jms/conf jboss-as-binaries/to-copy/docs/examples/jms/standalon!
 e jboss-as-binaries/to-copy/docs/examples/jmx jboss-as-binaries/to-copy/docs/examples/jmx/persistent-service.sar jboss-as-binaries/to-copy/docs/examples/jmx/persistent-service.sar/META-INF jboss-as-binaries/to-copy/docs/examples/jmx/persistent-service.sar/org jboss-as-binaries/to-copy/docs/examples/jmx/persistent-service.sar/org/jboss jboss-as-binaries/to-copy/docs/examples/jmx/persistent-service.sar/org/jboss/jmx jboss-as-binaries/to-copy/docs/examples/jmx/persistent-service.sar/org/jboss/jmx/examples jboss-as-binaries/to-copy/docs/examples/jmx/persistent-service.sar/org/jboss/jmx/examples/persistence jboss-as-binaries/to-copy/docs/examples/media jboss-as-binaries/to-copy/docs/examples/netboot jboss-as-binaries/to-copy/docs/examples/varia jboss-as-binaries/to-copy/docs/examples/varia/deployment-service jboss-as-binaries/to-copy/docs/examples/varia/deployment-service/schema jboss-as-binaries/to-copy/docs/examples/varia/deployment-service/templates jboss-as-binaries/to-copy/!
 docs/examples/varia/deployment-service/templates/jms-queue jboss-as-bi
naries/to-copy/docs/examples/varia/deployment-service/templates/jms-queue/vm jboss-as-binaries/to-copy/docs/examples/varia/deployment-service/templates/local-tx-datasource jboss-as-binaries/to-copy/docs/examples/varia/deployment-service/templates/local-tx-datasource/vm jboss-as-binaries/to-copy/docs/examples/varia/deployment-service/templates/no-tx-datasource jboss-as-binaries/to-copy/docs/examples/varia/deployment-service/templates/no-tx-datasource/vm jboss-as-binaries/to-copy/docs/examples/varia/deployment-service/templates/xa-datasource jboss-as-binaries/to-copy/docs/examples/varia/deployment-service/templates/xa-datasource/vm jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer/loadbalancer.sar jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer/loadbalancer.sar/META-INF jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer/loadbalancer.sar/loadbalancer.war jboss-as-binaries/to-copy/docs/example!
 s/varia/loadbalancer/loadbalancer.sar/loadbalancer.war/META-INF jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer/loadbalancer.sar/loadbalancer.war/WEB-INF jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer/loadbalancer.sar/org jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer/loadbalancer.sar/org/jboss jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer/loadbalancer.sar/org/jboss/web jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer/loadbalancer.sar/org/jboss/web/loadbalancer jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer/loadbalancer.sar/org/jboss/web/loadbalancer/monitor jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer/loadbalancer.sar/org/jboss/web/loadbalancer/scheduler jboss-as-binaries/to-copy/docs/examples/varia/loadbalancer/loadbalancer.sar/org/jboss/web/loadbalancer/util jboss-as-binaries/to-copy/docs/licenses jboss-as-binaries/to-copy/docs/schema jboss-as-binaries/to-copy/docs/tests jboss-as-binaries!
 /to-copy/docs/tests/org jboss-as-binaries/to-copy/docs/tests/org/jboss
 jboss-as-binaries/to-copy/docs/tests/org/jboss/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/aop jboss-as-binaries/to-copy/docs/tests/org/jboss/test/aop/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/bank jboss-as-binaries/to-copy/docs/tests/org/jboss/test/bank/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/bankiiop jboss-as-binaries/to-copy/docs/tests/org/jboss/test/bankiiop/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/binding jboss-as-binaries/to-copy/docs/tests/org/jboss/test/bmp jboss-as-binaries/to-copy/docs/tests/org/jboss/test/bmp/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cache jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cache/bean jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cache/stress jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cache/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cache/test/aop jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cache/test/eviction jboss-as!
 -binaries/to-copy/docs/tests/org/jboss/test/cache/test/generic jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cache/test/local jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cache/test/replicated jboss-as-binaries/to-copy/docs/tests/org/jboss/test/classloader jboss-as-binaries/to-copy/docs/tests/org/jboss/test/classloader/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/client jboss-as-binaries/to-copy/docs/tests/org/jboss/test/client/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cluster jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cluster/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/audit jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/audit/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/cacheinvalidation jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/cacheinvalidation/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/c!
 mr jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/cmr/test j
boss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/cmrstress jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/cmrtransaction jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/cmrtransaction/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/cmrtree jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/cmrtree/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/commerce jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/dbschema jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/dbschema/relationship jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/ejbselect jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/enums jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/enums/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/fkmapping jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/fkmapping/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/fkstackoverflow jboss-as-binaries/!
 to-copy/docs/tests/org/jboss/test/cmp2/fkstackoverflow/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/idxandusersql jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/idxandusersql/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/keygen jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/keygen/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/lob jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/optimisticlock jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/optimisticlock/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/passivation jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/passivation/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/perf jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/perf/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/readonly jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cmp2/relationship jboss-as-binaries/to-copy/docs!
 /tests/org/jboss/test/cmp2/simple jboss-as-binaries/to-copy/docs/tests
/org/jboss/test/compatibility jboss-as-binaries/to-copy/docs/tests/org/jboss/test/compatibility/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cts jboss-as-binaries/to-copy/docs/tests/org/jboss/test/cts/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/dbtest jboss-as-binaries/to-copy/docs/tests/org/jboss/test/dbtest/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/deadlock jboss-as-binaries/to-copy/docs/tests/org/jboss/test/deadlock/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/deployers jboss-as-binaries/to-copy/docs/tests/org/jboss/test/deployers/ear jboss-as-binaries/to-copy/docs/tests/org/jboss/test/deployers/ear/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/ejbconf jboss-as-binaries/to-copy/docs/tests/org/jboss/test/ejbconf/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/entity jboss-as-binaries/to-copy/docs/tests/org/jboss/test/entity/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/entityexc jboss-as-bin!
 aries/to-copy/docs/tests/org/jboss/test/entityexc/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/excepiiop jboss-as-binaries/to-copy/docs/tests/org/jboss/test/excepiiop/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/exception jboss-as-binaries/to-copy/docs/tests/org/jboss/test/ha jboss-as-binaries/to-copy/docs/tests/org/jboss/test/ha/jmx jboss-as-binaries/to-copy/docs/tests/org/jboss/test/ha/jmx/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/ha/singleton jboss-as-binaries/to-copy/docs/tests/org/jboss/test/ha/singleton/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/hello jboss-as-binaries/to-copy/docs/tests/org/jboss/test/hello/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/helloiiop jboss-as-binaries/to-copy/docs/tests/org/jboss/test/helloiiop/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/hellojrmpiiop jboss-as-binaries/to-copy/docs/tests/org/jboss/test/hellojrmpiiop/test jboss-as-binaries/to-copy/docs/tests/org/j!
 boss/test/hibernate jboss-as-binaries/to-copy/docs/tests/org/jboss/tes
t/hibernate/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/idgen jboss-as-binaries/to-copy/docs/tests/org/jboss/test/idgen/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/iiop jboss-as-binaries/to-copy/docs/tests/org/jboss/test/iiop/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/invokers jboss-as-binaries/to-copy/docs/tests/org/jboss/test/invokers/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/isolation jboss-as-binaries/to-copy/docs/tests/org/jboss/test/isolation/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jacc jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jacc/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jaxr jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jaxr/scout jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jaxr/scout/basic jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jaxr/scout/publish jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jaxr/scout/publish/infomodel jboss-as-binarie!
 s/to-copy/docs/tests/org/jboss/test/jaxr/scout/query jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jaxr/scout/query/infomodel jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmq jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmq/perf jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmq/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/compliance jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/compliance/modelmbean jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/compliance/monitor jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/compliance/notcompliant jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/compliance/objectname jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/compliance/registration jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/compliance/relation jboss-as-binaries/to-copy/docs/tests/org/jbo!
 ss/test/jbossmx/compliance/server jboss-as-binaries/to-copy/docs/tests
/org/jboss/test/jbossmx/compliance/standard jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/compliance/timer jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/implementation jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/implementation/persistence jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/implementation/server jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/implementation/util jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/performance jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/performance/dynamic jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jbossmx/performance/standard jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jca jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jca/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jmsra jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jmsra/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jmx jboss-as-binaries!
 /to-copy/docs/tests/org/jboss/test/jmx/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jrmp jboss-as-binaries/to-copy/docs/tests/org/jboss/test/jrmp/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/lock jboss-as-binaries/to-copy/docs/tests/org/jboss/test/lock/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/management jboss-as-binaries/to-copy/docs/tests/org/jboss/test/management/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/mdb jboss-as-binaries/to-copy/docs/tests/org/jboss/test/mdb/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/messagedriven jboss-as-binaries/to-copy/docs/tests/org/jboss/test/messagedriven/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/naming jboss-as-binaries/to-copy/docs/tests/org/jboss/test/naming/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/perf jboss-as-binaries/to-copy/docs/tests/org/jboss/test/perf/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/pooled jboss-as-binaries/to!
 -copy/docs/tests/org/jboss/test/pooled/test jboss-as-binaries/to-copy/
docs/tests/org/jboss/test/proxycompiler jboss-as-binaries/to-copy/docs/tests/org/jboss/test/proxycompiler/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/readahead jboss-as-binaries/to-copy/docs/tests/org/jboss/test/readahead/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/retry jboss-as-binaries/to-copy/docs/tests/org/jboss/test/retry/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/security jboss-as-binaries/to-copy/docs/tests/org/jboss/test/security/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/securitymgr jboss-as-binaries/to-copy/docs/tests/org/jboss/test/securitymgr/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/testbean jboss-as-binaries/to-copy/docs/tests/org/jboss/test/testbean/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/testbeancluster jboss-as-binaries/to-copy/docs/tests/org/jboss/test/testbeancluster/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/timer jboss-as-binaries/to-copy/docs/tests/org/j!
 boss/test/timer/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/tm jboss-as-binaries/to-copy/docs/tests/org/jboss/test/tm/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/txiiop jboss-as-binaries/to-copy/docs/tests/org/jboss/test/txiiop/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/txpropiiop jboss-as-binaries/to-copy/docs/tests/org/jboss/test/txpropiiop/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/txtimer jboss-as-binaries/to-copy/docs/tests/org/jboss/test/txtimer/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/util jboss-as-binaries/to-copy/docs/tests/org/jboss/test/util/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/web jboss-as-binaries/to-copy/docs/tests/org/jboss/test/web/test jboss-as-binaries/to-copy/docs/tests/org/jboss/test/web/test/ssl jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/addressrewrite jboss-as-binaries/to-copy/docs/!
 tests/org/jboss/test/webservice/admindevel jboss-as-binaries/to-copy/d
ocs/tests/org/jboss/test/webservice/attachment jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/attachmentstepbystep jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/encstyle jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/exception jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/handlerflow jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/header jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbas897 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws124 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws128 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws153 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws163 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws165 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws167 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws168 !
 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws217 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws64 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws68 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws70 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws71 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws79 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws82 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws83 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/jbws84 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/marshalltest jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/message jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/samples jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/samples2 jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/samp!
 les2docclient jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webs
ervice/version jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/ws4eesimple jboss-as-binaries/to-copy/docs/tests/org/jboss/test/webservice/wsdlimport jboss-as-binaries/to-copy/docs/tests/org/objectweb jboss-as-binaries/to-copy/docs/tests/org/objectweb/jtests jboss-as-binaries/to-copy/docs/tests/org/objectweb/jtests/jms jboss-as-binaries/to-copy/docs/tests/org/objectweb/jtests/jms/conform jboss-as-binaries/to-copy/docs/tests/org/objectweb/jtests/jms/conform/connection jboss-as-binaries/to-copy/docs/tests/org/objectweb/jtests/jms/conform/message jboss-as-binaries/to-copy/docs/tests/org/objectweb/jtests/jms/conform/message/headers jboss-as-binaries/to-copy/docs/tests/org/objectweb/jtests/jms/conform/message/properties jboss-as-binaries/to-copy/docs/tests/org/objectweb/jtests/jms/conform/queue jboss-as-binaries/to-copy/docs/tests/org/objectweb/jtests/jms/conform/selector jboss-as-binaries/to-copy/docs/tests/org/objectweb/jtests/jms/conform/session jboss-as-binaries!
 /to-copy/docs/tests/org/objectweb/jtests/jms/conform/topic jboss-as-binaries/to-copy/lib jboss-as-binaries/to-copy/lib/endorsed jboss-as-binaries/to-copy/server jboss-as-binaries/to-copy/server/all jboss-as-binaries/to-copy/server/all/conf jboss-as-binaries/to-copy/server/all/conf/props jboss-as-binaries/to-copy/server/all/conf/xmdesc jboss-as-binaries/to-copy/server/all/deploy jboss-as-binaries/to-copy/server/all/deploy/deploy.last jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer jboss-as-binaries/to-copy/server/all/deploy/ejb3.deployer/META-INF jboss-as-binaries/to-copy/server/all/deploy/httpha-invoker.sar jboss-as-binaries/to-copy/server/all/deploy/httpha-invoker.sar/META-INF jboss-as-binaries/to-copy/server/all/deploy/httpha-invoker.sar/invoker.war jboss-as-binaries/to-copy/server/all/deploy/httpha-invoker.sar/invoker.war/WEB-INF jboss-as-binaries/to-copy/server/all/deploy/httpha-invoker.sar/invoker.war/WEB-INF/classes jboss-as-binaries/to-copy/server/all/deplo!
 y/httpha-invoker.sar/invoker.war/WEB-INF/classes/org jboss-as-binaries
/to-copy/server/all/deploy/httpha-invoker.sar/invoker.war/WEB-INF/classes/org/jboss jboss-as-binaries/to-copy/server/all/deploy/httpha-invoker.sar/invoker.war/WEB-INF/classes/org/jboss/invocation jboss-as-binaries/to-copy/server/all/deploy/httpha-invoker.sar/invoker.war/WEB-INF/classes/org/jboss/invocation/http jboss-as-binaries/to-copy/server/all/deploy/httpha-invoker.sar/invoker.war/WEB-INF/classes/org/jboss/invocation/http/servlet jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer jboss-as-binaries/to-copy/server/all/deploy/jboss-aop-jdk50.deployer/META-INF jboss-as-binaries/to-copy/server/all/deploy/jboss-hibernate.deployer jboss-as-binaries/to-copy/server/all/deploy/jboss-hibernate.deployer/META-INF jboss-as-binaries/to-copy/server/all/deploy/jboss-ws4ee.sar jboss-as-binaries/to-copy/server/all/deploy/jboss-ws4ee.sar/META-INF jboss-as-binaries/to-copy/server/all/deploy/jbossweb-tomcat55.sar jboss-as-binaries/to-copy/server/all/deploy/jbossweb-tomcat55.!
 sar/META-INF jboss-as-binaries/to-copy/server/all/deploy/jbossweb-tomcat55.sar/ROOT.war jboss-as-binaries/to-copy/server/all/deploy/jbossweb-tomcat55.sar/ROOT.war/WEB-INF jboss-as-binaries/to-copy/server/all/deploy/jbossweb-tomcat55.sar/conf jboss-as-binaries/to-copy/server/all/deploy/jbossweb-tomcat55.sar/jsf-libs jboss-as-binaries/to-copy/server/all/deploy/jms jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war/META-INF jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war/WEB-INF jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war/WEB-INF/classes jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war/WEB-INF/classes/org jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war/WEB-INF/classes/org/jboss jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war/WEB-INF/classes/org/jboss/jmx jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war/WEB-INF/classes/org/jboss/jmx/adap!
 tor jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war/WEB-IN
F/classes/org/jboss/jmx/adaptor/control jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war/WEB-INF/classes/org/jboss/jmx/adaptor/html jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war/WEB-INF/classes/org/jboss/jmx/adaptor/model jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war/cluster jboss-as-binaries/to-copy/server/all/deploy/jmx-console.war/images jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar/META-INF jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar/META-INF/ddl jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar/juddiws.war jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar/juddiws.war/META-INF jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar/juddiws.war/WEB-INF jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar/juddiws.war/WEB-INF/classes jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar/juddiws.!
 war/WEB-INF/classes/org jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar/juddiws.war/WEB-INF/classes/org/jboss jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar/juddiws.war/WEB-INF/classes/org/jboss/jaxr jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar/juddiws.war/WEB-INF/classes/org/jboss/jaxr/juddi jboss-as-binaries/to-copy/server/all/deploy/juddi-service.sar/juddiws.war/WEB-INF/lib jboss-as-binaries/to-copy/server/all/deploy/management jboss-as-binaries/to-copy/server/all/deploy/management/console-mgr.sar jboss-as-binaries/to-copy/server/all/deploy/management/console-mgr.sar/META-INF jboss-as-binaries/to-copy/server/all/deploy/management/console-mgr.sar/web-console.war jboss-as-binaries/to-copy/server/all/deploy/management/console-mgr.sar/web-console.war/META-INF jboss-as-binaries/to-copy/server/all/deploy/management/console-mgr.sar/web-console.war/WEB-INF jboss-as-binaries/to-copy/server/all/deploy/management/console-mgr.sar/web-con!
 sole.war/WEB-INF/classes jboss-as-binaries/to-copy/server/all/deploy/m
anagement/console-mgr.sar/web-console.war/WEB-INF/tlds jboss-as-binaries/to-copy/server/all/deploy/management/console-mgr.sar/web-console.war/css jboss-as-binaries/to-copy/server/all/deploy/management/console-mgr.sar/web-console.war/images jboss-as-binaries/to-copy/server/all/deploy/management/console-mgr.sar/web-console.war/img jboss-as-binaries/to-copy/server/all/deploy/snmp-adaptor.sar jboss-as-binaries/to-copy/server/all/deploy/snmp-adaptor.sar/META-INF jboss-as-binaries/to-copy/server/all/deploy-hasingleton jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms/jbossmq-httpil.sar jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms/jbossmq-httpil.sar/META-INF jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms/jbossmq-httpil.sar/jbossmq-httpil.war jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms/jbossmq-httpil.sar/jbossmq-httpil.war/META-INF jboss-as-binaries/to-copy/server/all/de!
 ploy-hasingleton/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org/jboss jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org/jboss/mq jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org/jboss/mq/il jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org/jboss/mq/il/http jboss-as-binaries/to-copy/server/all/deploy-hasingleton/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org/jboss/mq/il/http/servlet jboss-as-binaries/to-copy/serv!
 er/all/farm jboss-as-binaries/to-copy/server/all/lib jboss-as-binaries
/to-copy/server/default jboss-as-binaries/to-copy/server/default/conf jboss-as-binaries/to-copy/server/default/conf/props jboss-as-binaries/to-copy/server/default/conf/xmdesc jboss-as-binaries/to-copy/server/default/deploy jboss-as-binaries/to-copy/server/default/deploy/http-invoker.sar jboss-as-binaries/to-copy/server/default/deploy/http-invoker.sar/META-INF jboss-as-binaries/to-copy/server/default/deploy/http-invoker.sar/invoker.war jboss-as-binaries/to-copy/server/default/deploy/http-invoker.sar/invoker.war/WEB-INF jboss-as-binaries/to-copy/server/default/deploy/http-invoker.sar/invoker.war/WEB-INF/classes jboss-as-binaries/to-copy/server/default/deploy/http-invoker.sar/invoker.war/WEB-INF/classes/org jboss-as-binaries/to-copy/server/default/deploy/http-invoker.sar/invoker.war/WEB-INF/classes/org/jboss jboss-as-binaries/to-copy/server/default/deploy/http-invoker.sar/invoker.war/WEB-INF/classes/org/jboss/invocation jboss-as-binaries/to-copy/server/default/deploy/http-invok!
 er.sar/invoker.war/WEB-INF/classes/org/jboss/invocation/http jboss-as-binaries/to-copy/server/default/deploy/http-invoker.sar/invoker.war/WEB-INF/classes/org/jboss/invocation/http/servlet jboss-as-binaries/to-copy/server/default/deploy/jboss-aop.deployer jboss-as-binaries/to-copy/server/default/deploy/jboss-aop.deployer/META-INF jboss-as-binaries/to-copy/server/default/deploy/jboss-hibernate.deployer jboss-as-binaries/to-copy/server/default/deploy/jboss-hibernate.deployer/META-INF jboss-as-binaries/to-copy/server/default/deploy/jboss-ws4ee.sar jboss-as-binaries/to-copy/server/default/deploy/jboss-ws4ee.sar/META-INF jboss-as-binaries/to-copy/server/default/deploy/jbossweb-tomcat55.sar jboss-as-binaries/to-copy/server/default/deploy/jbossweb-tomcat55.sar/META-INF jboss-as-binaries/to-copy/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war jboss-as-binaries/to-copy/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war/WEB-INF jboss-as-binaries/to-copy/server/default/deploy/jb!
 ossweb-tomcat55.sar/conf jboss-as-binaries/to-copy/server/default/depl
oy/jbossweb-tomcat55.sar/jsf-libs jboss-as-binaries/to-copy/server/default/deploy/jms jboss-as-binaries/to-copy/server/default/deploy/jms/jbossmq-httpil.sar jboss-as-binaries/to-copy/server/default/deploy/jms/jbossmq-httpil.sar/META-INF jboss-as-binaries/to-copy/server/default/deploy/jms/jbossmq-httpil.sar/jbossmq-httpil.war jboss-as-binaries/to-copy/server/default/deploy/jms/jbossmq-httpil.sar/jbossmq-httpil.war/META-INF jboss-as-binaries/to-copy/server/default/deploy/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF jboss-as-binaries/to-copy/server/default/deploy/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes jboss-as-binaries/to-copy/server/default/deploy/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org jboss-as-binaries/to-copy/server/default/deploy/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org/jboss jboss-as-binaries/to-copy/server/default/deploy/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org/jboss/mq jboss-as-binar!
 ies/to-copy/server/default/deploy/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org/jboss/mq/il jboss-as-binaries/to-copy/server/default/deploy/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org/jboss/mq/il/http jboss-as-binaries/to-copy/server/default/deploy/jms/jbossmq-httpil.sar/jbossmq-httpil.war/WEB-INF/classes/org/jboss/mq/il/http/servlet jboss-as-binaries/to-copy/server/default/deploy/jmx-console.war jboss-as-binaries/to-copy/server/default/deploy/jmx-console.war/META-INF jboss-as-binaries/to-copy/server/default/deploy/jmx-console.war/WEB-INF jboss-as-binaries/to-copy/server/default/deploy/jmx-console.war/WEB-INF/classes jboss-as-binaries/to-copy/server/default/deploy/jmx-console.war/WEB-INF/classes/org jboss-as-binaries/to-copy/server/default/deploy/jmx-console.war/WEB-INF/classes/org/jboss jboss-as-binaries/to-copy/server/default/deploy/jmx-console.war/WEB-INF/classes/org/jboss/jmx jboss-as-binaries/to-copy/server/default/deploy/jmx-console.w!
 ar/WEB-INF/classes/org/jboss/jmx/adaptor jboss-as-binaries/to-copy/ser
ver/default/deploy/jmx-console.war/WEB-INF/classes/org/jboss/jmx/adaptor/control jboss-as-binaries/to-copy/server/default/deploy/jmx-console.war/WEB-INF/classes/org/jboss/jmx/adaptor/html jboss-as-binaries/to-copy/server/default/deploy/jmx-console.war/WEB-INF/classes/org/jboss/jmx/adaptor/model jboss-as-binaries/to-copy/server/default/deploy/jmx-console.war/cluster jboss-as-binaries/to-copy/server/default/deploy/jmx-console.war/images jboss-as-binaries/to-copy/server/default/deploy/management jboss-as-binaries/to-copy/server/default/deploy/management/console-mgr.sar jboss-as-binaries/to-copy/server/default/deploy/management/console-mgr.sar/META-INF jboss-as-binaries/to-copy/server/default/deploy/management/console-mgr.sar/web-console.war jboss-as-binaries/to-copy/server/default/deploy/management/console-mgr.sar/web-console.war/META-INF jboss-as-binaries/to-copy/server/default/deploy/management/console-mgr.sar/web-console.war/WEB-INF jboss-as-binaries/to-copy/server/default/d!
 eploy/management/console-mgr.sar/web-console.war/WEB-INF/classes jboss-as-binaries/to-copy/server/default/deploy/management/console-mgr.sar/web-console.war/WEB-INF/tlds jboss-as-binaries/to-copy/server/default/deploy/management/console-mgr.sar/web-console.war/css jboss-as-binaries/to-copy/server/default/deploy/management/console-mgr.sar/web-console.war/images jboss-as-binaries/to-copy/server/default/deploy/management/console-mgr.sar/web-console.war/img jboss-as-binaries/to-copy/server/default/lib jboss-as-binaries/to-copy/server/minimal jboss-as-binaries/to-copy/server/minimal/conf jboss-as-binaries/to-copy/server/minimal/lib jspwiki jspwiki/src/pl/net/mamut/jspwiki jspwiki/src/webdocs jspwiki/tests jspwiki/tests/stress jspwiki/tld jspwiki-new jspwiki-new/etc jspwiki-new/etc/classes/pl/net/mamut/jspwiki jspwiki-new/src/com/ecyrd/jspwiki jspwiki-new/src/com/ecyrd/jspwiki/tags jspwiki-new/src/pl/net/mamut/jspwiki mysql-connector portal-binaries portal-binaries/to-copy portal-!
 binaries/to-copy/jboss-portal.sar portal-binaries/to-copy/jboss-portal
.sar/META-INF portal-binaries/to-copy/jboss-portal.sar/conf portal-binaries/to-copy/jboss-portal.sar/conf/cache portal-binaries/to-copy/jboss-portal.sar/conf/hibernate portal-binaries/to-copy/jboss-portal.sar/conf/theme portal-binaries/to-copy/jboss-portal.sar/lib portal-binaries/to-copy/jboss-portal.sar/org portal-binaries/to-copy/jboss-portal.sar/org/jboss portal-binaries/to-copy/jboss-portal.sar/org/jboss/portal portal-binaries/to-copy/jboss-portal.sar/org/jboss/portal/core portal-binaries/to-copy/jboss-portal.sar/org/jboss/portal/core/impl portal-binaries/to-copy/jboss-portal.sar/org/jboss/portal/core/impl/preferences portal-binaries/to-copy/jboss-portal.sar/org/jboss/portal/core/impl/role portal-binaries/to-copy/jboss-portal.sar/org/jboss/portal/core/impl/user portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/default-content portal-binaries/to-c!
 opy/jboss-portal.sar/portal-cms.sar/default-content/files portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/default-content/files/default portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/default-content/files/default/images portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/default-content/files/default/support portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/default-content/files/errorpages portal-binaries/to-copy/jboss-portal.sar/portal-cms.war portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/META-INF portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/WEB-INF portal-binaries/to-copy/jboss-portal.sar/portal-core.war portal-binaries/to-copy/jboss-portal.sar/portal-core.war/META-INF portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/classes portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp portal-binaries/to-copy/jboss-portal.sar/portal-core.!
 war/WEB-INF/jsp/admin portal-binaries/to-copy/jboss-portal.sar/portal-
core.war/WEB-INF/jsp/cms portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/admin portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/default portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/default/errorpages portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/cms/default/support portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/permission portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/role portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/test portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/jsp/user portal-binaries/to-copy/jboss-portal.sar/portal-core.war/WEB-INF/layout portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/admin portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/catalog portal-binaries/to-copy/jboss-portal.sar/po!
 rtal-core.war/images/cms portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/langs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/advhr portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/advhr/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/advhr/langs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/advimage portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/advimage/langs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/advlink portal-binaries/t!
 o-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plug
ins/advlink/langs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/emotions portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/emotions/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/emotions/langs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/flash portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/flash/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/flash/langs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/iespell portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/iespell/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/iespell/langs portal-binaries/to-copy/jboss-portal.sar/por!
 tal-core.war/images/cms/admin/tiny_mce/plugins/insertdatetime portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/insertdatetime/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/insertdatetime/langs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/preview portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/preview/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/preview/langs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/zoom portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/plugins/zoom/langs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced port!
 al-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/
tiny_mce/themes/advanced/docs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/ca_fr portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/ca_fr/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/cz portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/cz/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/de portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/de/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/es portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/es/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/a!
 dmin/tiny_mce/themes/advanced/docs/fi portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/fi/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/hu portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/hu/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/it portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/it/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/nl portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/nl/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/pl portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cm!
 s/admin/tiny_mce/themes/advanced/docs/pl/images portal-binaries/to-cop
y/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/se portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/se/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/uk portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/docs/uk/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/advanced/langs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/ca_fr portal-binaries/to-copy/jboss-portal.sar/portal-!
 core.war/images/cms/admin/tiny_mce/themes/default/docs/ca_fr/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/cz portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/cz/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/de portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/de/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/es portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/es/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/hu portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/hu/images portal-binaries/to-copy/jboss-portal.sar/por!
 tal-core.war/images/cms/admin/tiny_mce/themes/default/docs/it portal-b
inaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/it/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/pl portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/pl/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/se portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/se/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/uk portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/docs/uk/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/default/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/simple portal-binaries/to-copy/j!
 boss-portal.sar/portal-core.war/images/cms/admin/tiny_mce/themes/simple/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/permission portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/role portal-binaries/to-copy/jboss-portal.sar/portal-core.war/images/user portal-binaries/to-copy/jboss-portal.sar/portal-core.war/login portal-binaries/to-copy/jboss-portal.sar/portal-core.war/nodesk portal-binaries/to-copy/jboss-portal.sar/portal-core.war/nodesk/css portal-binaries/to-copy/jboss-portal.sar/portal-core.war/nodesk/images portal-binaries/to-copy/jboss-portal.sar/portal-core.war/nodesk/images/portal_utils portal-binaries/to-copy/jboss-portal.sar/portal-core.war/nodesk/images/portal_utils/btn_portlet_left portal-binaries/to-copy/jboss-portal.sar/portal-core.war/nodesk/images/portal_utils/btn_portlet_middle portal-binaries/to-copy/jboss-portal.sar/portal-core.war/nodesk/images/portlet_black_bottom portal-binaries/to-copy/jboss-portal.sar/portal-co!
 re.war/nodesk/images/portlet_black_middle portal-binaries/to-copy/jbos
s-portal.sar/portal-core.war/nodesk/images/portlet_black_top portal-binaries/to-copy/jboss-portal.sar/portal-core.war/nodesk/images/portlet_left_middle portal-binaries/to-copy/jboss-portal.sar/portal-core.war/nodesk/images/portlet_left_top portal-binaries/to-copy/jboss-portal.sar/portal-core.war/nodesk/images/portlet_middle_bottom portal-binaries/to-copy/jboss-portal.sar/portal-core.war/nodesk/images/portlet_middle_top portal-binaries/to-copy/jboss-portal.sar/portal-server.war portal-binaries/to-copy/jboss-portal.sar/portal-server.war/META-INF portal-binaries/to-copy/jboss-portal.sar/portal-server.war/WEB-INF portal-binaries/to-copy-head portal-binaries/to-copy-head/docs portal-binaries/to-copy-head/docs/licenses portal-binaries/to-copy-head/docs/referenceGuide portal-binaries/to-copy-head/docs/referenceGuide/html portal-binaries/to-copy-head/docs/referenceGuide/html/css portal-binaries/to-copy-head/docs/referenceGuide/html/images portal-binaries/to-copy-head/docs/referenceG!
 uide/html_single portal-binaries/to-copy-head/docs/referenceGuide/html_single/css portal-binaries/to-copy-head/docs/referenceGuide/html_single/images portal-binaries/to-copy-head/docs/referenceGuide/pdf portal-binaries/to-copy-head/docs/userGuide portal-binaries/to-copy-head/docs/userGuide/html portal-binaries/to-copy-head/docs/userGuide/html/css portal-binaries/to-copy-head/docs/userGuide/html/images portal-binaries/to-copy-head/docs/userGuide/html/images/admincms portal-binaries/to-copy-head/docs/userGuide/html/images/forums portal-binaries/to-copy-head/docs/userGuide/html/images/permissions portal-binaries/to-copy-head/docs/userGuide/html/images/role portal-binaries/to-copy-head/docs/userGuide/html/images/setup portal-binaries/to-copy-head/docs/userGuide/html_single portal-binaries/to-copy-head/docs/userGuide/html_single/css portal-binaries/to-copy-head/docs/userGuide/html_single/images portal-binaries/to-copy-head/docs/userGuide/html_single/images/admincms portal-binari!
 es/to-copy-head/docs/userGuide/html_single/images/forums portal-binari
es/to-copy-head/docs/userGuide/html_single/images/permissions portal-binaries/to-copy-head/docs/userGuide/html_single/images/role portal-binaries/to-copy-head/docs/userGuide/html_single/images/setup portal-binaries/to-copy-head/docs/userGuide/pdf portal-binaries/to-copy-head/setup portal-default portal-default/src/web/WEB-INF portal-default/to-copy/jboss-portal.sar/portal-core.war/WEB-INF portal-federation portal-federation/src/web/WEB-INF portal-federation/src/web/WEB-INF/tld
Reply-to: jbo...@li...
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <E1E...@co...>
Date: Wed, 24 Aug 2005 14:42:06 -0400

Author: dam...@jb...
Date: 2005-08-24 14:15:28 -0400 (Wed, 24 Aug 2005)
New Revision: 945

Added:
   qa/forge/portal-extensions/binaries/maven-repo-addons/jboss/jars/jboss-aop.jar
   qa/forge/portal-extensions/binaries/maven-repo-addons/jboss/jars/jboss-ejb3.jar
   qa/forge/portal-extensions/binaries/maven-repo-addons/jboss/jars/jboss-ejb3x.jar
   qa/forge/portal-extensions/binaries/maven-repo-addons/tmate/jars/javasvn-cli.jar
   qa/forge/portal-extensions/binaries/maven-repo-addons/tmate/jars/javasvn-javahl.jar
   qa/forge/portal-extensions/federation-register/maven.xml
   qa/forge/portal-extensions/forge-ads/maven.xml
   qa/forge/portal-extensions/forge-blog/maven.xml
   qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeProperties.java
   qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/SearchTools.java
   qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/BlogNodeWatcher.java
   qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/BlogUpdaterNodeWatcher.java
   qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/
   qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/ContentManager.java
   qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/FileBasedContentManager.java
   qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java
   qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DomToXmlTransformer.java
   qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsNodeWatcher.java
   qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/service/
   qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/service/ForgeManagement.java
   qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/service/NodeWatcher.java
   qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/service/ResourceWatcher.java
   qa/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/WikiURLTag.java
   qa/forge/portal-extensions/forge-contributor/maven.xml
   qa/forge/portal-extensions/forge-contributor/src/etc/
   qa/forge/portal-extensions/forge-contributor/src/etc/Messages.properties
   qa/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConAccessBean.java
   qa/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConDataBean.java
   qa/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConDescriptor.java
   qa/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConMainBean.java
   qa/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConNodeWatcher.java
   qa/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java
   qa/forge/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConTools.java
   qa/forge/portal-extensions/forge-contributor/src/web/WEB-INF/faces-config.xml
   qa/forge/portal-extensions/forge-ear/
   qa/forge/portal-extensions/forge-ear/src/
   qa/forge/portal-extensions/forge-ear/src/META-INF/
   qa/forge/portal-extensions/forge-ear/src/META-INF/application.xml
   qa/forge/portal-extensions/forge-file-access/maven.xml
   qa/forge/portal-extensions/forge-file-access/src/etc/
   qa/forge/portal-extensions/forge-file-access/src/etc/mime-types.txt
   qa/forge/portal-extensions/forge-file-access/src/web/WEB-INF/tld/
   qa/forge/portal-extensions/forge-file-access/src/web/WEB-INF/tld/forge.tld
   qa/forge/portal-extensions/forge-forums/
   qa/forge/portal-extensions/forge-forums/maven.xml
   qa/forge/portal-extensions/forge-forums/project.xml
   qa/forge/portal-extensions/forge-forums/to-copy/
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/META-INF/
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/META-INF/MANIFEST.MF
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/META-INF/application.xml
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/META-INF/jboss-app.xml
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums-lib.jar
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/META-INF/
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/META-INF/MANIFEST.MF
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/META-INF/jboss-service.xml
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/conf/
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/conf/hibernate/
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/conf/hibernate/hibernate.cfg.xml
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/conf/hibernate/setup.txt
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/CategoryImpl.hbm.xml
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/ForumImpl.hbm.xml
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/PollImpl.hbm.xml
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/PostImpl.hbm.xml
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/PosterImpl.hbm.xml
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/TopicImpl.hbm.xml
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.sar/org/jboss/portlet/forums/impl/WatchImpl.hbm.xml
   qa/forge/portal-extensions/forge-forums/to-copy/portal-forums.ear/portal-forums.war
   qa/forge/portal-extensions/forge-info/maven.xml
   qa/forge/portal-extensions/forge-map/maven.xml
   qa/forge/portal-extensions/forge-navigation/maven.xml
   qa/forge/portal-extensions/forge-portal-attr/
   qa/forge/portal-extensions/forge-portal-attr/maven.xml
   qa/forge/portal-extensions/forge-portal-attr/project.xml
   qa/forge/portal-extensions/forge-portal-attr/src/
   qa/forge/portal-extensions/forge-portal-attr/src/java/
   qa/forge/portal-extensions/forge-portal-attr/src/java/org/
   qa/forge/portal-extensions/forge-portal-attr/src/java/org/jboss/
   qa/forge/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/
   qa/forge/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/
   qa/forge/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/AttributesFilter.java
   qa/forge/portal-extensions/forge-portal-attr/to-copy/
   qa/forge/portal-extens...
 
[truncated message content]

[Jboss-svn-commits] JBL Code SVN: r944 - /

[<jbo...@li...>]

Author: dam...@jb...
Date: 2005-08-24 13:26:47 -0400 (Wed, 24 Aug 2005)
New Revision: 944

Added:
   prod/
Log:
BRANCH: qa to prod.

Copied: prod (from rev 943, qa)

[Jboss-svn-commits] JBL Code SVN: r943 - in trunk/forge/portal-extensions: forge-common/src/java/org/jboss/forge/common/content forge-common/src/java/org/jboss/forge/common/projects forge-service/src/java/org/jboss/forge/service

[<jbo...@li...>]

Author: adamw
Date: 2005-08-24 11:45:57 -0400 (Wed, 24 Aug 2005)
New Revision: 943

Modified:
   trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java
   trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DomToXmlTransformer.java
   trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java
   trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java
   trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java
   trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java
Log:
Buttons in downloads, spaces in transformed project html deleted


Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java	2005-08-24 15:44:50 UTC (rev 942)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/content/SvnContentManager.java	2005-08-24 15:45:57 UTC (rev 943)
@@ -106,7 +106,7 @@
     	
     	try {
 			ourClientManager.getCommitClient().doCommit(files, false, 
-					"New content", true, true);
+					"Forge service commit.", true, true);
 		} catch (SVNException e) {
 			try { cleanup(); } catch (SVNException e1) { e1.printStackTrace(); }
 			

Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DomToXmlTransformer.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DomToXmlTransformer.java	2005-08-24 15:44:50 UTC (rev 942)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DomToXmlTransformer.java	2005-08-24 15:45:57 UTC (rev 943)
@@ -9,22 +9,15 @@
 package org.jboss.forge.common.projects;
 
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 
 import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.xerces.parsers.DOMParser;
-import org.jboss.forge.common.projects.XmlInputFactory.XmlNotFoundException;
-import org.w3c.dom.Document;
 import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
 
 /**
  * @author adamw
@@ -32,37 +25,7 @@
  * in XML.
  */
 public class DomToXmlTransformer {
-    private Node xsl;
-    
     /**
-     * Creates a new transformer which will use the given stylesheet
-     * for transformations.
-     * @param source
-     * @throws SAXException
-     * @throws IOException
-     * @throws XmlNotFoundException
-     */
-    public DomToXmlTransformer(InputSource source) throws SAXException, 
-    IOException, XmlNotFoundException {
-		// Creating a node representing the style's xsl.
-		DOMParser parser = new DOMParser();
-		parser.parse(source);
-		Document doc = parser.getDocument();
-
-		xsl = doc.getDocumentElement();
-    }
-    
-    /**
-     * Creates a new transformer with an "id" stylesheet (identity).
-     * @throws SAXException
-     * @throws IOException
-     * @throws XmlNotFoundException
-     */
-    public DomToXmlTransformer() {
-    	xsl = null;
-    }
-    
-    /**
      * Creates a string-xml representation of the given node.
      * @param root Node to transform
      * @return A string contating data from the given node in a XML format.
@@ -70,16 +33,10 @@
      */
     public String transformNode(Node root) throws TransformerException {
     	TransformerFactory tFactory = TransformerFactory.newInstance();
-    	Transformer transformer;
-    	
-    	if (xsl != null) {
-    		Source xslSource = new DOMSource(xsl);
-    		transformer = tFactory.newTransformer(xslSource);
-    	} else {
-    		transformer = tFactory.newTransformer();
-    		transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
-    	}
+    	Transformer transformer = tFactory.newTransformer();;
 
+    	transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         transformer.transform(new DOMSource(root), new StreamResult(bos));
         

Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java	2005-08-24 15:44:50 UTC (rev 942)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java	2005-08-24 15:45:57 UTC (rev 943)
@@ -186,7 +186,9 @@
                             getFilesPropertiesHandler(isf, projectId,
                                     downloadPrefix, pathCategoryContext,
                                     separator,componentDir),
-                            getFilesExtendedPropertiesMap(),
+                            getFilesExtendedPropertiesMap(downloadPrefix,
+                            		pathCategoryContext, separator, portalName,
+                            		projectId),
                             new OutsidePropertiesMap());
                 }
             }
@@ -259,18 +261,44 @@
         return stack;
     }
 
-    private ExtendedPropertiesMap getFilesExtendedPropertiesMap() {
+    private boolean isOutsideLink(String link) {
+    	return link.startsWith("http://") || 
+    		link.startsWith("ftp://") ||
+    		link.startsWith("https://");
+    }
+    
+    private ExtendedPropertiesMap getFilesExtendedPropertiesMap(
+    		final String downloadPrefix, final String pathCategoryContext, 
+    		final String separator, final String portalName, 
+    		final String projectId) {
     	ExtendedPropertiesMap epm = new ExtendedPropertiesMap();
     	epm.addPropertySupport("button", 
-    			getButtonPropertiesHandler(), 
+    			getButtonPropertiesHandler(downloadPrefix, pathCategoryContext,
+    					separator, portalName, projectId), 
     			new BindingsHandlerIterSingleKey("button", "buttons"));
     	return epm;
     }
     
-    private PropertiesHandler getButtonPropertiesHandler() {
+    private PropertiesHandler getButtonPropertiesHandler(
+    		final String downloadPrefix, final String pathCategoryContext, 
+    		final String separator, final String portalName, 
+    		final String projectId) {
     	return new PropertiesHandler() {
 			public void fillContextShallow(PropertiesMap properties, DelegateContext context) {
-				context.put("link", properties.get("id").getFirstValue());
+				String id = properties.get("id").getFirstValue();
+				
+				if (isOutsideLink(id))
+                    context.put("link", id);
+                else {
+                	if ("true".equals(properties.get("freezone").getFirstValue()))
+                		context.put("link", 
+                				new ProjectsHelper().createFreezonePageLink(
+                						portalName, projectId, id));
+                	else
+                		context.put("link", downloadPrefix + pathCategoryContext
+                            + separator + id);
+                }
+				
 				context.put("name", properties.get("name").getFirstValue());
 			}
 
@@ -307,7 +335,7 @@
                  * compute the file size ourselves. If it is aboslute, we read
                  * it from the provided tag.
                  */
-                if ((id.startsWith("http://")) || (id.startsWith("ftp://"))) {
+                if (isOutsideLink(id)) {
                     context.put("link", id);
                     context.put("size", properties.get("size").getFirstValue());
                     outsideFile = true;

Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java	2005-08-24 15:44:50 UTC (rev 942)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java	2005-08-24 15:45:57 UTC (rev 943)
@@ -71,8 +71,7 @@
         projectsContexts = new TreeMap<String, DelegateContext>();
 
         try {
-        	DomToXmlTransformer xht = new DomToXmlTransformer(
-        			isf.getInputSource(ProjectsHelper.STYLE_XSL));
+        	DomToXmlTransformer xht = new DomToXmlTransformer();
         	
             opm = getProjectOutsidePropertiesMap(isf, xht);
             

Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java	2005-08-24 15:44:50 UTC (rev 942)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java	2005-08-24 15:45:57 UTC (rev 943)
@@ -46,8 +46,7 @@
      */
     private Map<String, Projects> projectsObjects;
     private ForgeHelper forgeHelper;
-
-    protected final static String STYLE_XSL = "style.xsl";
+    
     protected final static String PAGES_DESC = "pages.xml";
     protected final static String JEMS_DESC = "jems.xml";
     protected final static String CATEGORIES_DESC = "categories.xml";
@@ -130,6 +129,7 @@
                 + ".freezone&project=" + projectId + "&page="
                 + forgeHelper.replace(page, "/", FREEZONE_SEPARATOR);
     }
+    
     public String createDocsPageLink(String portalName, String projectId,
             String page) {
         return "/portal/index.html?ctrl:id=page." + portalName

Modified: trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java
===================================================================
--- trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java	2005-08-24 15:44:50 UTC (rev 942)
+++ trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeTimer.java	2005-08-24 15:45:57 UTC (rev 943)
@@ -41,6 +41,9 @@
 		
 			fm.update();
 			
+			// Avoiding WARN.
+			timer.cancel();
+			
 			// Scheduling next timer to timeout after the amount of time that
 			// is set in forgeManagement.
 			scheduleTimer(fm.getTimerInterval());