Menu
▾
▴
jboss-svn-commits — JBoss SVN commit notifications
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(233) |
Sep
(199) |
Oct
(206) |
Nov
(185) |
Dec
(270) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(232) |
Feb
(426) |
Mar
(623) |
Apr
(592) |
May
(506) |
Jun
(389) |
Jul
(160) |
Aug
(3) |
Sep
(1) |
Oct
(1) |
Nov
(2) |
Dec
(5) |
| 2007 |
Jan
(1) |
Feb
(1) |
Mar
(2) |
Apr
(2) |
May
(4) |
Jun
(2) |
Jul
|
Aug
(3) |
Sep
(5) |
Oct
(9) |
Nov
(6) |
Dec
(6) |
| 2008 |
Jan
(3) |
Feb
|
Mar
(1) |
Apr
(3) |
May
(3) |
Jun
(5) |
Jul
(10) |
Aug
(2) |
Sep
(12) |
Oct
(10) |
Nov
(54) |
Dec
(49) |
| 2009 |
Jan
(19) |
Feb
(13) |
Mar
(20) |
Apr
(24) |
May
(44) |
Jun
(29) |
Jul
(32) |
Aug
(10) |
Sep
(7) |
Oct
(10) |
Nov
(4) |
Dec
(17) |
| 2010 |
Jan
(14) |
Feb
(5) |
Mar
(23) |
Apr
(50) |
May
(31) |
Jun
(9) |
Jul
(5) |
Aug
(4) |
Sep
(7) |
Oct
(5) |
Nov
(2) |
Dec
(3) |
| 2011 |
Jan
(12) |
Feb
(5) |
Mar
(5) |
Apr
(3) |
May
(4) |
Jun
(3) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2012 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(4) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2015 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <jbo...@li...> - 2005-10-14 19:04:11
|
Author: aron.gombas
Date: 2005-10-14 15:03:58 -0400 (Fri, 14 Oct 2005)
New Revision: 1388
Modified:
trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java
Log:
WebDAV client lib bug finally solved
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java 2005-10-14 18:56:34 UTC (rev 1387)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java 2005-10-14 19:03:58 UTC (rev 1388)
@@ -135,12 +135,16 @@
// init cache: create WebDAV collection if not existing
WebdavResource cacheDir = null;
- WebdavUtils.dumpResourceChildren(root);
- while((cacheDir = root.getChildResources().getResource(cacheDirName)) == null) {
+ WebdavUtils.dumpResourceChildren(root);
+ cacheDir = root.getChildResources().getResource(cacheDirName);
+ if(cacheDir == null) {
log.info(String.format("Creating WebDAV collection \"%s\"...", cacheDirPath));
root.mkcolMethod(cacheDirPath);
WebdavUtils.dumpResourceChildren(root);
+ cacheDir = root.getChildResources().getResource(cacheDirName);
+ if(cacheDir == null)
+ throw new IllegalStateException("Couldn't find WebDAV cache directory");
}
// clear cache: remove old resource(s) from WebDAV
|
|
From: <jbo...@li...> - 2005-10-14 18:57:00
|
Author: aron.gombas Date: 2005-10-14 14:56:34 -0400 (Fri, 14 Oct 2005) New Revision: 1387 Added: trunk/labs/kosmos/web-server/WEB-INF/lib/jakarta-slide-webdavlib-2.0.jar Removed: trunk/labs/kosmos/web-server/WEB-INF/lib/jakarta-slide-webdavlib-2.1.jar Log: Slide WebDAV client lib downgraded to 2.0 Added: trunk/labs/kosmos/web-server/WEB-INF/lib/jakarta-slide-webdavlib-2.0.jar =================================================================== (Binary files differ) Property changes on: trunk/labs/kosmos/web-server/WEB-INF/lib/jakarta-slide-webdavlib-2.0.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/labs/kosmos/web-server/WEB-INF/lib/jakarta-slide-webdavlib-2.1.jar =================================================================== (Binary files differ) |
|
From: <jbo...@li...> - 2005-10-14 12:43:34
|
Author: aron.gombas
Date: 2005-10-14 08:43:24 -0400 (Fri, 14 Oct 2005)
New Revision: 1384
Added:
trunk/labs/kosmos/src/java/hu/midori/kosmos/server/util/WebdavUtils.java
Modified:
trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java
Log:
WebdavUtils added
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java 2005-10-14 06:14:52 UTC (rev 1383)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java 2005-10-14 12:43:24 UTC (rev 1384)
@@ -6,6 +6,8 @@
*/
package hu.midori.kosmos.server;
+import hu.midori.kosmos.server.util.WebdavUtils;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
@@ -13,6 +15,7 @@
import java.util.Date;
import java.util.Enumeration;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import org.apache.commons.httpclient.HttpURL;
@@ -132,9 +135,12 @@
// init cache: create WebDAV collection if not existing
WebdavResource cacheDir = null;
+ WebdavUtils.dumpResourceChildren(root);
while((cacheDir = root.getChildResources().getResource(cacheDirName)) == null) {
log.info(String.format("Creating WebDAV collection \"%s\"...", cacheDirPath));
root.mkcolMethod(cacheDirPath);
+
+ WebdavUtils.dumpResourceChildren(root);
}
// clear cache: remove old resource(s) from WebDAV
Added: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/util/WebdavUtils.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/util/WebdavUtils.java 2005-10-14 06:14:52 UTC (rev 1383)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/util/WebdavUtils.java 2005-10-14 12:43:24 UTC (rev 1384)
@@ -0,0 +1,35 @@
+/*
+ * Kosmos.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package hu.midori.kosmos.server.util;
+
+import java.io.IOException;
+
+import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.webdav.lib.WebdavResource;
+
+/**
+ * Utility methods for WebDAV management.
+ *
+ * @author <a href="mailto:aro...@mi...">Aron Gombas</a>
+ * @version $Id$
+ */
+public class WebdavUtils {
+ private static Log log = LogFactory.getLog(WebdavUtils.class);
+
+ /** This class should never be instantiated. */
+ protected WebdavUtils() { }
+
+ /** Writes the children of a given resources to the log. */
+ public static void dumpResourceChildren(WebdavResource resource) throws HttpException, IOException {
+ String resourceNames[] = resource.getChildResources().list();
+ log.info(String.format("URL: %s, path: %s, %d children", resource.getHttpURL(), resource.getPath(), resourceNames.length));
+ for(int i = 0; i < resourceNames.length; i++)
+ log.info(String.format(" %d: %s", i, resourceNames[i]));
+ }
+}
|
|
From: <jbo...@li...> - 2005-10-14 06:14:58
|
Author: aron.gombas
Date: 2005-10-14 02:14:52 -0400 (Fri, 14 Oct 2005)
New Revision: 1383
Modified:
trunk/labs/kosmos/build-distro.xml
Log:
Javadocs warnings resolved
Modified: trunk/labs/kosmos/build-distro.xml
===================================================================
--- trunk/labs/kosmos/build-distro.xml 2005-10-13 19:16:41 UTC (rev 1382)
+++ trunk/labs/kosmos/build-distro.xml 2005-10-14 06:14:52 UTC (rev 1383)
@@ -37,10 +37,10 @@
<!-- targets -->
<target name="init">
- <echo message="============================================================"/>
- <echo message="${project.name} distribution - ${project.version}"/>
- <echo message="Copyright 2005 (C) Midori"/>
- <echo message="============================================================"/>
+ <echo message="============================================================"/>
+ <echo message="${project.name} distribution - ${project.version}"/>
+ <echo message="Copyright 2005 (C) Midori"/>
+ <echo message="============================================================"/>
</target>
<target name="clean" depends="init" description="Cleans up temporary files created during previous builds">
@@ -50,7 +50,7 @@
<target name="dist" depends="init,dist-bin,dist-src" description="Prepares all distributables"/>
<target name="dist-bin" depends="init,clean" description="Prepares all binary distributables"><!-- ,manual-html,manual-pdf -->
- <!-- prepare subprojects -->
+ <!-- prepare subprojects -->
<ant antfile="build-portlet.xml" target="dist-bin" inheritall="false"/>
<ant antfile="build-server.xml" target="dist-bin" inheritall="false"/>
@@ -99,6 +99,9 @@
<fileset dir="${src.dir}" defaultexcludes="yes">
<include name="java/hu/midori/kosmos/**"/>
</fileset>
+ <classpath>
+ <fileset dir="." includes="web-**/WEB-INF/lib/*.jar"/>
+ </classpath>
</javadoc>
</target>
|
|
From: <jbo...@li...> - 2005-10-13 15:02:47
|
Author: aron.gombas
Date: 2005-10-13 11:02:30 -0400 (Thu, 13 Oct 2005)
New Revision: 1381
Modified:
trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java
Log:
'/' added to the end of the WebDAV dir path
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java 2005-10-13 12:01:53 UTC (rev 1380)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java 2005-10-13 15:02:30 UTC (rev 1381)
@@ -124,9 +124,10 @@
WebdavResource root = new WebdavResource(webdavUrl);
String cacheDirName = "kosmos-cache";
- String cacheDirPath = root.getPath() + "/" + cacheDirName;
+ String cacheDirPath = root.getPath() + "/" + cacheDirName + "/";
+
String cachedFilename = getCachedFileName(fileName);
- String cachedFilePath = cacheDirPath + "/" + cachedFilename;
+ String cachedFilePath = cacheDirPath + cachedFilename;
String cachedFileUrl = clientUrl + "/" + cacheDirName + "/" + URLEncoder.encode(cachedFilename, "utf-8");
// init cache: create WebDAV collection if not existing
|
|
From: <jbo...@li...> - 2005-10-13 12:02:01
|
Author: aron.gombas
Date: 2005-10-13 08:01:53 -0400 (Thu, 13 Oct 2005)
New Revision: 1380
Modified:
trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java
Log:
WebDAV path VS filename issue fixed
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java 2005-10-12 20:41:58 UTC (rev 1379)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java 2005-10-13 12:01:53 UTC (rev 1380)
@@ -97,7 +97,7 @@
* Saves the passed stream to a WebDAV repository-based cache and returns
* the absolute URL pointing to the resulted file.
*/
- protected String saveCachedFile(String filename, InputStream in) throws URIException, IOException {
+ protected String saveCachedFile(String fileName, InputStream in) throws URIException, IOException {
// grab parameters
String url = ctx.getServletContext().getInitParameter("webdav.url");
String user = ctx.getServletContext().getInitParameter("webdav.user");
@@ -120,26 +120,24 @@
// use "webdav.url" if "webdav.clientUrl" was not specified
if((clientUrl == null) || (clientUrl.trim().length() == 0))
clientUrl = webdavUrl.getURI();
+
+ WebdavResource root = new WebdavResource(webdavUrl);
String cacheDirName = "kosmos-cache";
- String cachedFilename = getCachedFilename(filename);
- String cachedFilePath = webdavUrl.getPath() + "/" + cacheDirName + "/" + cachedFilename;
+ String cacheDirPath = root.getPath() + "/" + cacheDirName;
+ String cachedFilename = getCachedFileName(fileName);
+ String cachedFilePath = cacheDirPath + "/" + cachedFilename;
String cachedFileUrl = clientUrl + "/" + cacheDirName + "/" + URLEncoder.encode(cachedFilename, "utf-8");
// init cache: create WebDAV collection if not existing
- WebdavResource root = new WebdavResource(webdavUrl);
- WebdavResource cacheDir = root.getChildResources().getResource(cacheDirName);
- if(cacheDir == null) {
- if(!isHttps) { // TODO using this with https throws an exception?
- log.debug(String.format("Creating WebDAV collection \"%s\"...", cacheDirName));
- root.mkcolMethod(root.getPath() + "/" + cacheDirName);
-
- cacheDir = root.getChildResources().getResource(cacheDirName);
- }
+ WebdavResource cacheDir = null;
+ while((cacheDir = root.getChildResources().getResource(cacheDirName)) == null) {
+ log.info(String.format("Creating WebDAV collection \"%s\"...", cacheDirPath));
+ root.mkcolMethod(cacheDirPath);
}
// clear cache: remove old resource(s) from WebDAV
- String cachedWildcard = getCachedWildcard(filename);
+ String cachedWildcard = getCachedWildcard(fileName);
Enumeration oldCachedFiles = cacheDir.getChildResources().getResources();
while(oldCachedFiles.hasMoreElements()) {
WebdavResource oldCachedFile = (WebdavResource)oldCachedFiles.nextElement();
@@ -148,13 +146,13 @@
if(oldCachedFile.getName().endsWith(cachedWildcard)) {
log.debug(String.format("Deleting outdated WebDAV resource \"%s\"...", oldCachedFile.getName()));
- root.deleteMethod(oldCachedFile.getPath());// TODO it doesn't work with name only?! Slide bug?
+ root.deleteMethod(oldCachedFile.getPath());
}
}
// fill cache: put new resource to WebDAV
log.debug(String.format("Putting WebDAV resource \"%s\"...", cachedFilename));
- root.putMethod(cachedFilePath, in);// TODO it doesn't work with name only?! Slide bug?
+ root.putMethod(cachedFilePath, in);
cacheDir.close();
root.close();
@@ -174,7 +172,7 @@
* Returns the local filename for a cached item, by adding a timestamp prefix
* so that browsers will not cache the item if it actually changes.
*/
- private String getCachedFilename(String filename) throws UnsupportedEncodingException {
+ private String getCachedFileName(String filename) throws UnsupportedEncodingException {
return encodeFilename(Long.toString(new Date().getTime()), filename);
}
|
|
From: <jbo...@li...> - 2005-10-12 20:42:17
|
Author: adamw Date: 2005-10-12 16:41:58 -0400 (Wed, 12 Oct 2005) New Revision: 1379 Modified: trunk/forge/portal-extensions/forge-common/ trunk/forge/portal-extensions/forge-contributor/ trunk/forge/portal-extensions/forge-login-portlet/maven.xml trunk/forge/portal-extensions/forge-navigation/ trunk/forge/portal-extensions/forge-service/ trunk/forge/portal-extensions/shotoku/maven.xml Log: Clean goal fixed Property changes on: trunk/forge/portal-extensions/forge-common ___________________________________________________________________ Name: svn:ignore - .svnignore target .classpath .project *.iml *.iws *.ipr + .settings .svnignore target .classpath .project *.iml *.iws *.ipr Property changes on: trunk/forge/portal-extensions/forge-contributor ___________________________________________________________________ Name: svn:ignore - .svnignore target .classpath .project *.iml *.iws *.ipr + .settings .svnignore target .classpath .project *.iml *.iws *.ipr Modified: trunk/forge/portal-extensions/forge-login-portlet/maven.xml =================================================================== --- trunk/forge/portal-extensions/forge-login-portlet/maven.xml 2005-10-12 20:03:36 UTC (rev 1378) +++ trunk/forge/portal-extensions/forge-login-portlet/maven.xml 2005-10-12 20:41:58 UTC (rev 1379) @@ -17,4 +17,8 @@ <goal name="deploy"> <attainGoal name="prj-war-deploy" /> </goal> + + <goal name="clean"> + <attainGoal name="prj-clean" /> + </goal> </project> Property changes on: trunk/forge/portal-extensions/forge-navigation ___________________________________________________________________ Name: svn:ignore - .svnignore target .classpath .project *.iml *.iws *.ipr + .settings .svnignore target .classpath .project *.iml *.iws *.ipr Property changes on: trunk/forge/portal-extensions/forge-service ___________________________________________________________________ Name: svn:ignore - .svnignore target .classpath .project *.iml *.iws *.ipr + .settings .svnignore target .classpath .project *.iml *.iws *.ipr Modified: trunk/forge/portal-extensions/shotoku/maven.xml =================================================================== --- trunk/forge/portal-extensions/shotoku/maven.xml 2005-10-12 20:03:36 UTC (rev 1378) +++ trunk/forge/portal-extensions/shotoku/maven.xml 2005-10-12 20:41:58 UTC (rev 1379) @@ -46,6 +46,7 @@ <goal name="clean"> <attainGoal name="prj-clean" /> <ant:delete dir="shotoku-base/target" /> + <ant:delete dir="shotoku-aop/target" /> <ant:delete dir="shotoku-svn/target" /> <ant:delete dir="shotoku-svn-service/target" /> <ant:delete dir="shotoku-test/target" /> |
|
From: <jbo...@li...> - 2005-10-12 14:08:01
|
Author: aron.gombas
Date: 2005-10-12 10:07:31 -0400 (Wed, 12 Oct 2005)
New Revision: 1377
Added:
trunk/labs/kosmos/build-distro.xml
Modified:
trunk/labs/kosmos/build-portlet.xml
trunk/labs/kosmos/build-server.xml
trunk/labs/kosmos/build/build.xml
trunk/labs/kosmos/build/deploy.xml
trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp
trunk/labs/kosmos/web-portlet/pages/jira_monitoring.jsp
Log:
Distribution scheme and build sys changed
Modified: trunk/labs/kosmos/build/build.xml
===================================================================
--- trunk/labs/kosmos/build/build.xml 2005-10-12 06:03:49 UTC (rev 1376)
+++ trunk/labs/kosmos/build/build.xml 2005-10-12 14:07:31 UTC (rev 1377)
@@ -12,7 +12,6 @@
<!-- read basic properties -->
<property environment="env"/>
- <property file="build/build.properties"/>
<property file="build/kosmos-project.properties"/>
<property file="build/${module.name}-module.properties"/>
<property name="module.name.short" value="${project.name.short}-${module.name}"/>
@@ -24,22 +23,13 @@
<property name="src.dir" location="src"/>
<property name="web.dir" location="web-${module.name}"/>
<property name="xdocs.dir" location="xdocs"/>
- <property name="reference.dir" location="${xdocs.dir}/reference"/>
<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-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.dir" location="dist-bin-${module.name}"/>
<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.dir" location="${dist-src.root.dir}/${module.name.full}"/>
- <property name="dist-src.docs.api.dir" location="${dist-src.dir}/docs/api"/>
<!-- targets -->
<target name="init">
@@ -108,63 +98,8 @@
</target>
<target name="redeploy" depends="undeploy,deploy" description="Redeploys the module to the container"/>
-
- <target name="javadocs" depends="init" description="Generates the javadocs">
- <javadoc destdir="${dist-src.docs.api.dir}" author="true" version="true" use="true" windowtitle="${project.name} API">
- <fileset dir="${src.dir}" defaultexcludes="yes">
- <include name="java/hu/midori/kosmos/**"/>
- </fileset>
- </javadoc>
- </target>
- <target name="manual-html" depends="init" description="Creates the manual in HTML format">
- <mkdir dir="${dist-bin.docs.reference.dir}/html"/>
- <java jar="${saxon.dir}/saxon8.jar" fork="true" output="${dist-bin.docs.reference.dir}/html/reference-manual.html">
- <arg line="-novw"/><!-- supress versin warning -->
- <arg line="${reference.dir}/reference-manual.xml"/>
- <arg line="${docbook.dir}/html/docbook.xsl"/>
- </java>
- <copy todir="${dist-bin.docs.reference.dir}/html">
- <fileset dir="${reference.dir}" excludes="**/*.xml"/>
- </copy>
- </target>
-
- <target name="manual-pdf" depends="init" description="Creates the manual in PDF format">
- <mkdir dir="${dist-bin.docs.reference.dir}/pdf"/>
- <java classname="org.apache.fop.apps.Fop" fork="true">
- <classpath>
- <fileset dir="${fop.dir}" includes="**/*.jar"/>
- </classpath>
- <arg line="-xml ${reference.dir}/reference-manual.xml"/>
- <arg line="-xsl ${docbook.dir}/fo/docbook.xsl"/>
- <arg value="${dist-bin.docs.reference.dir}/pdf/reference-manual.pdf"/>
- </java>
- </target>
-
- <target name="dist-src" depends="init,clean,javadocs" description="Prepares all source distributables">
- <mkdir dir="${dist-src.dir}"/>
- <!-- copy other resources -->
- <copy todir="${dist-src.dir}">
- <fileset dir="." includes="build-${module.name}.xml,deploy-${module.name}-*.xml"/>
- </copy>
- <copy todir="${dist-src.dir}/build">
- <fileset dir="${build.dir}"/>
- </copy>
- <copy todir="${dist-src.dir}/conf-${module.name}">
- <fileset dir="${conf.dir}"/>
- </copy>
- <copy todir="${dist-src.dir}/src">
- <fileset dir="${src.dir}"/>
- </copy>
- <copy todir="${dist-src.dir}/web-${module.name}">
- <fileset dir="${web.dir}"/>
- </copy>
- <copy todir="${dist-src.dir}/xdocs">
- <fileset dir="${xdocs.dir}"/>
- </copy>
- </target>
-
- <target name="dist-bin" depends="init,all,manual-html,manual-pdf" description="Prepares all binary distributables">
+ <target name="dist-bin" depends="init,all" description="Prepares all binary distributables">
<!-- pack to WAR -->
<war destfile="${dist-bin.dir}/${war.name}" basedir="${dist-bin.bin.dir}" webxml="web-${module.name}/WEB-INF/web.xml"/>
<delete dir="${dist-bin.bin.dir}"/>
@@ -173,23 +108,10 @@
<fileset dir="." includes="deploy-${module.name}-*.xml"/>
</copy>
<copy todir="${dist-bin.dir}/build">
- <fileset dir="${build.dir}" excludes="build.xml"/>
+ <fileset dir="${build.dir}" includes="deploy.xml,kosmos-project.properties,${module.name}-*-deploy.properties"/>
</copy>
<copy todir="${dist-bin.dir}/conf">
<fileset dir="${conf.dir}"/>
</copy>
- <copy todir="${dist-bin.dir}">
- <fileset dir="${xdocs.dir}/others" includes="**/*"/>
- </copy>
- </target>
-
- <target name="dist" depends="dist-src,dist-bin" description="Packs all distributables">
- <mkdir dir="${dist.root.dir}"/>
- <!-- pack -->
- <zip file="${dist.root.dir}/${module.name.full}-src.zip" basedir="${dist-src.root.dir}"/>
- <tar destfile="${dist.root.dir}/${module.name.full}-src.tar.gz" basedir="${dist-src.root.dir}" compression="gzip" longfile="gnu"/>
- <!-- pack -->
- <zip file="${dist.root.dir}/${module.name.full}.zip" basedir="${dist-bin.root.dir}"/>
- <tar destfile="${dist.root.dir}/${module.name.full}.tar.gz" basedir="${dist-bin.root.dir}" compression="gzip" longfile="gnu"/>
- </target>
+ </target>
</project>
Modified: trunk/labs/kosmos/build/deploy.xml
===================================================================
--- trunk/labs/kosmos/build/deploy.xml 2005-10-12 06:03:49 UTC (rev 1376)
+++ trunk/labs/kosmos/build/deploy.xml 2005-10-12 14:07:31 UTC (rev 1377)
@@ -29,7 +29,7 @@
</target>
<target name="deploy" depends="init" description="Deploys the portlet to the container">
- <echo message="Deploying to ${container.name} at ${container.dir}"/>
+ <echo message="Deploying to ${container.name} at ${container.dir}"/>
<mkdir dir="${container.dir}"/>
<!-- expand WAR -->
<unzip src="${war.name}" dest="${container.dir}"/>
Added: trunk/labs/kosmos/build-distro.xml
===================================================================
--- trunk/labs/kosmos/build-distro.xml 2005-10-12 06:03:49 UTC (rev 1376)
+++ trunk/labs/kosmos/build-distro.xml 2005-10-12 14:07:31 UTC (rev 1377)
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Kosmos.
+
+ Distributable under LGPL license.
+ See terms of license at gnu.org.
+-->
+<!-- Kosmos build-script for the distribution packages -->
+<!-- $Id$ -->
+<project basedir="." default="dist" name="Kosmos Distro">
+ <description>Kosmos Distro build-file</description>
+
+ <!-- read basic properties -->
+ <property file="build/build.properties"/>
+ <property file="build/kosmos-project.properties"/>
+ <property name="distro-bin.name" value="${project.name.short}-${project.version}"/>
+ <property name="distro-src.name" value="${project.name.short}-src-${project.version}"/>
+
+ <!-- generated paths -->
+ <property name="src.dir" location="src"/>
+ <property name="dist.dir" location="dist"/>
+
+ <property name="dist-bin.dir" location="${dist.dir}/${distro-bin.name}"/>
+ <property name="dist-bin.docs.reference.dir" location="${dist-bin.dir}/docs/reference"/>
+ <property name="dist-bin.etc.dir" location="${dist-bin.dir}/etc"/>
+ <property name="dist-bin.portlet.dir" location="${dist-bin.dir}/portlet"/>
+ <property name="dist-bin.server.dir" location="${dist-bin.dir}/server"/>
+
+ <property name="dist-src.dir" location="${dist.dir}/${distro-src.name}"/>
+ <property name="dist-src.docs.api.dir" location="${dist-src.dir}/docs/api"/>
+
+ <property name="xdocs.dir" location="xdocs"/>
+ <property name="reference.dir" location="${xdocs.dir}/reference"/>
+
+<!-- TODO create preconfigured package for Gridsphere and JBP?! -->
+<!-- TODO install with the deploy scripts? -->
+
+ <!-- targets -->
+ <target name="init">
+ <echo message="============================================================"/>
+ <echo message="${project.name} distribution - ${project.version}"/>
+ <echo message="Copyright 2005 (C) Midori"/>
+ <echo message="============================================================"/>
+ </target>
+
+ <target name="clean" depends="init" description="Cleans up temporary files created during previous builds">
+ <delete dir="${dist.dir}"/>
+ </target>
+
+ <target name="dist" depends="init,dist-bin,dist-src" description="Prepares all distributables"/>
+
+ <target name="dist-bin" depends="init,clean" description="Prepares all binary distributables"><!-- ,manual-html,manual-pdf -->
+ <!-- prepare subprojects -->
+ <ant antfile="build-portlet.xml" target="dist-bin" inheritall="false"/>
+ <ant antfile="build-server.xml" target="dist-bin" inheritall="false"/>
+
+ <!-- collect all files -->
+ <mkdir dir="${dist-bin.etc.dir}"/>
+ <mkdir dir="${dist-bin.portlet.dir}"/>
+ <mkdir dir="${dist-bin.server.dir}"/>
+ <copy todir="${dist-bin.etc.dir}">
+ <fileset dir="etc" includes="**/*"/>
+ </copy>
+ <copy todir="${dist-bin.portlet.dir}">
+ <fileset dir="dist-bin-portlet" includes="**/*"/>
+ </copy>
+ <copy todir="${dist-bin.server.dir}">
+ <fileset dir="dist-bin-server" includes="**/*"/>
+ </copy>
+ <copy todir="${dist-bin.dir}">
+ <fileset dir="xdocs/others" includes="**/*"/>
+ </copy>
+
+ <!-- pack -->
+ <zip file="${dist.dir}/${distro-bin.name}.zip" basedir="${dist.dir}" includes="${distro-bin.name}/**"/>
+ <tar destfile="${dist.dir}/${distro-bin.name}.tar.gz" basedir="${dist.dir}" includes="${distro-bin.name}/**" compression="gzip" longfile="gnu"/>
+ </target>
+
+ <target name="dist-src" depends="init,clean,javadocs" description="Prepares all source distributables">
+ <!-- collect all files -->
+ <mkdir dir="${dist-src.dir}"/>
+ <copy todir="${dist-src.dir}">
+ <fileset dir="." includes="build-*.xml,deploy-*.xml"/>
+ <fileset dir="." includes="build/**"/>
+ <fileset dir="." includes="conf-*/**"/>
+ <fileset dir="." includes="etc/**"/>
+ <fileset dir="." includes="src/**"/>
+ <fileset dir="." includes="web-*/**"/>
+ <fileset dir="." includes="xdocs/**"/>
+ </copy>
+
+ <!-- pack -->
+ <zip file="${dist.dir}/${distro-src.name}.zip" basedir="${dist.dir}" includes="${distro-src.name}/**"/>
+ <tar destfile="${dist.dir}/${distro-src.name}.tar.gz" basedir="${dist.dir}" includes="${distro-src.name}/**" compression="gzip" longfile="gnu"/>
+ </target>
+
+ <target name="javadocs" depends="init" description="Generates the javadocs">
+ <javadoc destdir="${dist-src.docs.api.dir}" author="true" version="true" use="true" windowtitle="${project.name} API">
+ <fileset dir="${src.dir}" defaultexcludes="yes">
+ <include name="java/hu/midori/kosmos/**"/>
+ </fileset>
+ </javadoc>
+ </target>
+
+ <target name="manual-html" description="Creates the manual in HTML format">
+ <mkdir dir="${dist-bin.docs.reference.dir}/html"/>
+ <java jar="${saxon.dir}/saxon8.jar" fork="true" output="${dist-bin.docs.reference.dir}/html/reference-manual.html">
+ <arg line="-novw"/><!-- supress version warning -->
+ <arg line="${reference.dir}/reference-manual.xml"/>
+ <arg line="${docbook.dir}/html/docbook.xsl"/>
+ </java>
+ <copy todir="${dist-bin.docs.reference.dir}/html">
+ <fileset dir="${reference.dir}" excludes="**/*.xml"/>
+ </copy>
+ </target>
+
+ <target name="manual-pdf" description="Creates the manual in PDF format">
+ <mkdir dir="${dist-bin.docs.reference.dir}/pdf"/>
+ <java classname="org.apache.fop.apps.Fop" fork="true">
+ <classpath>
+ <fileset dir="${fop.dir}" includes="**/*.jar"/>
+ </classpath>
+ <arg line="-xml ${reference.dir}/reference-manual.xml"/>
+ <arg line="-xsl ${docbook.dir}/fo/docbook.xsl"/>
+ <arg value="${dist-bin.docs.reference.dir}/pdf/reference-manual.pdf"/>
+ </java>
+ </target>
+</project>
Modified: trunk/labs/kosmos/build-portlet.xml
===================================================================
--- trunk/labs/kosmos/build-portlet.xml 2005-10-12 06:03:49 UTC (rev 1376)
+++ trunk/labs/kosmos/build-portlet.xml 2005-10-12 14:07:31 UTC (rev 1377)
@@ -1,4 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Kosmos.
+
+ Distributable under LGPL license.
+ See terms of license at gnu.org.
+-->
<!-- Kosmos build-script for the Portlet Module -->
<!-- $Id$ -->
<project basedir="." default="redeploy" name="Kosmos Portlet">
Modified: trunk/labs/kosmos/build-server.xml
===================================================================
--- trunk/labs/kosmos/build-server.xml 2005-10-12 06:03:49 UTC (rev 1376)
+++ trunk/labs/kosmos/build-server.xml 2005-10-12 14:07:31 UTC (rev 1377)
@@ -1,4 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Kosmos.
+
+ Distributable under LGPL license.
+ See terms of license at gnu.org.
+-->
<!-- Kosmos build-script for the Server Module -->
<!-- $Id$ -->
<project basedir="." default="redeploy" name="Kosmos Server">
Modified: trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp 2005-10-12 06:03:49 UTC (rev 1376)
+++ trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp 2005-10-12 14:07:31 UTC (rev 1377)
@@ -44,7 +44,7 @@
</td>
<td>
- <table style="border: 1px solid black;" width="100px" valign="middle" align="center" cellspacing="0" cellpadding="0">
+ <table style="border: 1px solid #DDDDDD;" width="100px" valign="middle" align="center" cellspacing="0" cellpadding="0">
<tr>
<td style="background-color:#00FF00"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${100*projectsIt.successRate}" maxFractionDigits="0"/>" height="10px" border="0"/></td>
<td style="background-color:#FF0000"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${(100*projectsIt.failures) / projectsIt.tests}" maxFractionDigits="0"/>" height="10px" border="0"/></td>
Modified: trunk/labs/kosmos/web-portlet/pages/jira_monitoring.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/jira_monitoring.jsp 2005-10-12 06:03:49 UTC (rev 1376)
+++ trunk/labs/kosmos/web-portlet/pages/jira_monitoring.jsp 2005-10-12 14:07:31 UTC (rev 1377)
@@ -51,7 +51,7 @@
<table valign="center">
<tr>
<td>
- <table style="border: 1px solid black;" width="100px" valign="middle" align="center" cellspacing="0" cellpadding="0">
+ <table style="border: 1px solid #DDDDDD;" width="100px" valign="middle" align="center" cellspacing="0" cellpadding="0">
<tr>
<td style="background-color:#FF0000"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${(100*projectsIt.openIssues) / projectsIt.totalIssues}" maxFractionDigits="0"/>" height="10px" border="0"/></td>
<td style="background-color:#FFFF00"><img src="<%= renderRequest.getContextPath() %>/pages/images/spacer.gif" width="<fmt:formatNumber value="${(100*projectsIt.codingInProgressIssues) / projectsIt.totalIssues}" maxFractionDigits="0"/>" height="10px" border="0"/></td>
|
|
From: <jbo...@li...> - 2005-10-12 06:03:57
|
Author: aron.gombas
Date: 2005-10-12 02:03:49 -0400 (Wed, 12 Oct 2005)
New Revision: 1376
Modified:
trunk/labs/kosmos/build/kosmos-project.properties
trunk/labs/kosmos/src/java/hu/midori/kosmos/server/util/ChartUtils.java
Log:
Returned to 2D piecharts
Modified: trunk/labs/kosmos/build/kosmos-project.properties
===================================================================
--- trunk/labs/kosmos/build/kosmos-project.properties 2005-10-12 06:03:20 UTC (rev 1375)
+++ trunk/labs/kosmos/build/kosmos-project.properties 2005-10-12 06:03:49 UTC (rev 1376)
@@ -1,3 +1,3 @@
project.name=Kosmos
project.name.short=kosmos
-project.version=0.1.1
+project.version=0.1.2
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/util/ChartUtils.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/util/ChartUtils.java 2005-10-12 06:03:20 UTC (rev 1375)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/util/ChartUtils.java 2005-10-12 06:03:49 UTC (rev 1376)
@@ -63,12 +63,8 @@
/** Returns the pie-chart generated from the passed data. */
public static JFreeChart generatePieChart(PieDataset dataset) {
// generate chart
- JFreeChart chart = ChartFactory.createPieChart3D(null, dataset, false, false, false);
+ JFreeChart chart = ChartFactory.createPieChart(null, dataset, false, false, false);
chart.setBackgroundPaint(TRANSPARENT_COLOR);
-
- // fine-tune plotting
- PiePlot3D plot = (PiePlot3D)chart.getPlot();
- plot.setDepthFactor(0.1f);
return chart;
}
|
|
From: <jbo...@li...> - 2005-10-12 06:03:25
|
Author: aron.gombas Date: 2005-10-12 02:03:20 -0400 (Wed, 12 Oct 2005) New Revision: 1375 Modified: trunk/labs/kosmos/xdocs/others/welcome.txt Log: More detailed welcome.txt Modified: trunk/labs/kosmos/xdocs/others/welcome.txt =================================================================== --- trunk/labs/kosmos/xdocs/others/welcome.txt 2005-10-12 06:02:36 UTC (rev 1374) +++ trunk/labs/kosmos/xdocs/others/welcome.txt 2005-10-12 06:03:20 UTC (rev 1375) @@ -6,7 +6,11 @@ Visit for latest info: http://labs.jboss.com/projects/kosmos +For detailed information about the project, technical details or +installation, please read the Reference Manual. + + Subversion repository: https://svn.labs.jboss.com/trunk/labs/kosmos/ Anonymous Subversion repository: http://anonsvn.labs.jboss.com/trunk/labs/kosmos |
|
From: <jbo...@li...> - 2005-10-12 06:02:43
|
Author: aron.gombas
Date: 2005-10-12 02:02:36 -0400 (Wed, 12 Oct 2005)
New Revision: 1374
Modified:
trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java
Log:
Dir creation bug fixed
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java 2005-10-11 21:11:02 UTC (rev 1373)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java 2005-10-12 06:02:36 UTC (rev 1374)
@@ -131,9 +131,9 @@
WebdavResource cacheDir = root.getChildResources().getResource(cacheDirName);
if(cacheDir == null) {
if(!isHttps) { // TODO using this with https throws an exception?
- root.mkcolMethod(cacheDirName);
log.debug(String.format("Creating WebDAV collection \"%s\"...", cacheDirName));
-
+ root.mkcolMethod(root.getPath() + "/" + cacheDirName);
+
cacheDir = root.getChildResources().getResource(cacheDirName);
}
}
|
Author: szimano
Date: 2005-10-11 17:11:02 -0400 (Tue, 11 Oct 2005)
New Revision: 1373
Modified:
trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/AttachmentDataSource.java
trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java
trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/MediaDataSource.java
trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/RenamePageWatcher.java
trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java
trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPageDictionary.java
trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java
trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminRenamingPlugin.java
Log:
renaming works !!!
Modified: trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2005-10-11 21:01:52 UTC (rev 1372)
+++ trunk/forge/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/fileaccess/WikiFileAccessFilter.java 2005-10-11 21:11:02 UTC (rev 1373)
@@ -144,8 +144,6 @@
// Parse URI to get filename and page name
String[] tokens = requestURI.split("[/]");
- System.out.println("TOK LEN: "+tokens.length);
-
if ((tokens.length == 1)&&(tokens[0].equals(""))) {
//show Main page - as there is no place to go specified :)
httpResponse.sendRedirect(hostURL + wikiHome);
Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/AttachmentDataSource.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/AttachmentDataSource.java 2005-10-11 21:01:52 UTC (rev 1372)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/AttachmentDataSource.java 2005-10-11 21:11:02 UTC (rev 1373)
@@ -82,4 +82,9 @@
* @return true if attachemnts were deleted. False otherwise.
*/
public boolean deleteAttachments(String pageName);
+
+ /**Sets wikiEngine reference
+ * @param wikiEngine
+ */
+ public void setWikiEngine(WikiEngine wikiEngine);
}
Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java 2005-10-11 21:01:52 UTC (rev 1372)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java 2005-10-11 21:11:02 UTC (rev 1373)
@@ -1052,14 +1052,15 @@
}
public synchronized void rename(String uid, String newName)
- throws PageAlreadyExistsException {
- lock = true;
-
+ throws PageRenamingException {
+
if (wikiEngine.pageExists(newName)) {
- throw new PageAlreadyExistsException(
- "Page with the name you're trying to rename already exists.");
+ throw new PageRenamingException(
+ "Page with the name you're trying rename to already exists.");
}
-
+
+ lock = true;
+
pageDictionary.setProperty(uid, newName);
pageRevDictionary.setProperty(newName, uid);
@@ -1067,18 +1068,20 @@
// find apropriate uid
int i = 2;
-
+
while ((pageExists(uid + String.valueOf(i)))
|| (pageDictionary.containsKey(uid + String.valueOf(i)))) {
- i++;
+ System.out.println(i++);
}
// add maping for new (to be done) with name translated to old uid
pageDictionary.setProperty(uid + String.valueOf(i), uid);
pageRevDictionary.setProperty(uid, uid + String.valueOf(i));
+
+ saveDictionary();
- //saveDictionary();
-
+ System.out.println("Renamed (uid) "+uid+" to "+newName);
+
lock = false;
}
Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/MediaDataSource.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/MediaDataSource.java 2005-10-11 21:01:52 UTC (rev 1372)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/MediaDataSource.java 2005-10-11 21:11:02 UTC (rev 1373)
@@ -188,5 +188,8 @@
*/
public boolean deletePage(String pageName);
+ /**Sets wikiEngine reference
+ * @param wikiEngine
+ */
public void setWikiEngine(WikiEngine wikiEngine);
}
Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/RenamePageWatcher.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/RenamePageWatcher.java 2005-10-11 21:01:52 UTC (rev 1372)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/RenamePageWatcher.java 2005-10-11 21:11:02 UTC (rev 1373)
@@ -42,11 +42,14 @@
for (int i = 0; i < uids.size(); i++) {
try {
wikiPageDictionary.rename(uids.get(i), realNames.get(i));
- } catch (PageAlreadyExistsException e) {
+ } catch (PageRenamingException e) {
e.printStackTrace();
}
}
+ //clear tables
+ uids.clear(); realNames.clear();
+
wikiEngine.getS().release();
runs = false;
Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java 2005-10-11 21:01:52 UTC (rev 1372)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java 2005-10-11 21:11:02 UTC (rev 1373)
@@ -30,6 +30,7 @@
import javax.xml.parsers.SAXParserFactory;
import org.jboss.wiki.exceptions.PageNotEditedException;
+import org.jboss.wiki.exceptions.PageRenamingException;
import org.jboss.wiki.exceptions.WikiException;
import java.io.File;
@@ -115,7 +116,6 @@
}
public boolean pageExists(String pageName) {
- System.out.println("pageEx: "+pageName);
return mediaDataSource.pageExists(getUid(pageName));
}
@@ -272,7 +272,9 @@
editedPages = new HashSet<Integer>();
mediaDataSource.setWikiEngine(this);
-
+ attachementDataSource.setWikiEngine(this);
+ wikiPageDictionary.setWikiEngine(this);
+
pages = new HashMap<String, WikiPage>();
wikiTypes = new HashMap<String, WikiType>();
@@ -712,8 +714,18 @@
}
public synchronized void rename(String uid, String newName) throws WikiException {
+ if (newName.indexOf("/") != -1) {
+ throw new PageRenamingException ("You can rename only page/subpage name. / is not allowed.");
+ }
+
+ if (uid.indexOf("/") != -1) {
+ //renaming subpage - create aprop. newName
+ newName = uid.substring(0, uid.lastIndexOf("/")+1)+newName;
+ }
+
if (!arePagesEdited()) {
wikiPageDictionary.rename(uid, newName);
+ System.out.println(10);
}
else {
// some pages are edited now - execute watcher
Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPageDictionary.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPageDictionary.java 2005-10-11 21:01:52 UTC (rev 1372)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiPageDictionary.java 2005-10-11 21:11:02 UTC (rev 1373)
@@ -9,11 +9,16 @@
public String getUid(String realName);
- public void rename(String uid, String newName) throws PageAlreadyExistsException;
+ public void rename(String uid, String newName) throws PageRenamingException;
public boolean uidInDictionary(String uid);
public boolean realNameInDictionary(String realName);
public void removeDictForPage(String uid) throws PageRenamingException;
+
+ /**Sets wikiEngine reference
+ * @param wikiEngine
+ */
+ public void setWikiEngine(WikiEngine wikiEngine);
}
Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java 2005-10-11 21:01:52 UTC (rev 1372)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java 2005-10-11 21:11:02 UTC (rev 1373)
@@ -88,7 +88,7 @@
.getPageContent());
adminConsole.append("\n<hr><h3>Admin console</h3>\n");
-
+ adminConsole.append("Go to <a href=\"").append(actionURL).append("&type=admin").append("\">ADMIN GENERAL CONSOLE</a><br />\n");
if (errorMsg.length() > 0) {
adminConsole.append("<i>" + errorMsg + "</i><br />\n");
}
Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminRenamingPlugin.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminRenamingPlugin.java 2005-10-11 21:01:52 UTC (rev 1372)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminRenamingPlugin.java 2005-10-11 21:11:02 UTC (rev 1373)
@@ -16,27 +16,28 @@
@Override
public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) {
Credentials credentials = (Credentials)wikiSession.getAttribute("credentials");
- StringBuilder adminContent = new StringBuilder("<h3>Admin</h3><br />\n");
+ String actionURL = (String)wikiSession.getAttribute("actionURL");
+ StringBuilder adminContent = new StringBuilder("<h2><a href=\"").append(actionURL).append("&type=admin \">Admin</a></h2><br />\n");
if (credentials.isAdmin()) {
+ adminContent.append("<h3>Renaming:</h3>\n<br />\n");
+
if((wikiSession.getAttribute("var1") != null)&&(wikiSession.getAttribute("var1").equals(RENAME_CAPTION))) {
if ((wikiSession.getAttribute("var2") != null)&&(wikiSession.getAttribute("var3") != null)) {
String oldName = (String)wikiSession.getAttribute("var2");
String uid = wikiEngine.getUid(oldName);
- String newName = (String)wikiSession.getAttribute("var3");
+ String newName = HTMLTranslatorParts.cleanLink((String)wikiSession.getAttribute("var3"));
- System.out.println("oldname: "+oldName+"\nuid: "+uid+"\nnewName: "+newName);
try {
wikiEngine.rename(uid, newName);
- adminContent.append("Added renaming from page: ").append(oldName).append(" to page: ").append(newName).append("<br />\n");
+ adminContent.append("Added renaming from page: ").append(oldName).append(" to page: ").append(newName).append("<br /><br />\n");
} catch (WikiException e) {
- adminContent.append("Couldn't rename page because: ").append(e.getMessage()).append("<br />\n");
+ adminContent.append("Couldn't rename page because: ").append(e.getMessage()).append("<br /><br />\n");
e.printStackTrace();
}
}
}
- String actionURL = (String)wikiSession.getAttribute("actionURL");
HashMap<String,String> pagesWaiting = wikiEngine.getPagesWaiting();
|
|
From: <jbo...@li...> - 2005-10-11 21:02:04
|
Author: unibrew
Date: 2005-10-11 17:01:52 -0400 (Tue, 11 Oct 2005)
New Revision: 1372
Modified:
branches/forge/rysiek/portal-extensions/forge-ear/src/META-INF/application.xml
branches/forge/rysiek/portal-extensions/portal-default/src/web/WEB-INF/default-portal.xml
Log:
Rysieks Mods.
Modified: branches/forge/rysiek/portal-extensions/forge-ear/src/META-INF/application.xml
===================================================================
--- branches/forge/rysiek/portal-extensions/forge-ear/src/META-INF/application.xml 2005-10-11 18:46:38 UTC (rev 1371)
+++ branches/forge/rysiek/portal-extensions/forge-ear/src/META-INF/application.xml 2005-10-11 21:01:52 UTC (rev 1372)
@@ -1,5 +1,4 @@
<application>
-
<display-name>JBoss Labs - forge infrastructure</display-name>
<module>
<ejb>forge-service.ejb3</ejb>
@@ -15,6 +14,11 @@
</web>
</module>
<module>
+ <web>
+ <web-uri>primates-portlet.war</web-uri>
+ </web>
+ </module>
+ <module>
<web>
<web-uri>blog-portlet.war</web-uri>
</web>
Modified: branches/forge/rysiek/portal-extensions/portal-default/src/web/WEB-INF/default-portal.xml
===================================================================
--- branches/forge/rysiek/portal-extensions/portal-default/src/web/WEB-INF/default-portal.xml 2005-10-11 18:46:38 UTC (rev 1371)
+++ branches/forge/rysiek/portal-extensions/portal-default/src/web/WEB-INF/default-portal.xml 2005-10-11 21:01:52 UTC (rev 1372)
@@ -77,8 +77,27 @@
<height>0</height>
<window-state>normal</window-state>
</window>
+ <window>
+ <window-name>PrimatesPortletWindowDefaultDefault</window-name>
+ <instance-ref>primates.PrimatesPortlet.PrimatesPortletInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ <window-state>normal</window-state>
+ </window>
</page>
-
+
+ <!-- test page-->
+<!--<page>
+ <page-name>prim</page-name>
+ <window>
+ <window-name>PrimatesPortletWindow</window-name>
+ <instance-ref>primates.PrimatesPortlet.PrimatesPortletInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ <window-state>normal</window-state>
+ </window>
+</page>-->
+
<!-- login page -->
<page>
<page-name>login</page-name>
@@ -413,7 +432,7 @@
<height>3</height>
<window-state>normal</window-state>
</window>
-
+
<window>
<window-name>ForumsPortletWindowDefaultForums</window-name>
<instance-ref>forums.ForumsPortlet.ForumsPortletInstance</instance-ref>
|
Author: unibrew
Date: 2005-10-11 14:46:38 -0400 (Tue, 11 Oct 2005)
New Revision: 1371
Added:
branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/jsp/primates.jsp
Modified:
branches/forge/rysiek/portal-extensions/primates/build.properties
branches/forge/rysiek/portal-extensions/primates/project.xml
branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/Primate.java
branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/Primates.java
branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesDescriptor.java
branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesNodeWatcher.java
branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesPortlet.java
branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesTools.java
branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/jboss-app.xml
branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/jboss-portlet.xml
branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/portlet-instances.xml
branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/portlet.xml
branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/web.xml
Log:
test.
Modified: branches/forge/rysiek/portal-extensions/primates/build.properties
===================================================================
--- branches/forge/rysiek/portal-extensions/primates/build.properties 2005-10-11 15:59:18 UTC (rev 1370)
+++ branches/forge/rysiek/portal-extensions/primates/build.properties 2005-10-11 18:46:38 UTC (rev 1371)
@@ -1,21 +1,16 @@
-# Path to where your portal extensions are to be deployed
-local.deploy.dir=/Volumes/JBoss/servers/labs/server/all/deploy
+# Path to where JBoss AS is to be copied.
+local.server.dir=/home/rysiek/JBossAS
-# Path to where yout portal with JBoss as are to be copied (it's de facto local.deploy.dir without server/all/deploy part )
-local.server.dir=/Volumes/JBoss/servers/labs
+# Path to where your portal extensions are to be deployed - you shouldn't
+# have to change that.
+local.deploy.dir=${local.server.dir}/server/all/deploy
# Path to your local maven repository - you can comment this out if you use
# the default location. You can also create a build.properties in your home
# directory to set the maven.repo.local for all projects.
-# maven.repo.local=
+#maven.repo.local=/home/rysiek/.maven/repository
+#maven.repo.local=
# URL of your content repository. You don't have to specify this if you don't
-# plan to update the content by maven.
+# plan to update the content by maven (it's need for CruiseControl).
maven.scm.url=
-
-# Address, username and password to access the JBoss JMX Console. Necessary to
-# successfully obtain the 'redeploy-portal' goal; comment out if you won't be
-# using it.
-jboss.jmx.console=
-jboss.jmx.username=
-jboss.jmx.password=
Modified: branches/forge/rysiek/portal-extensions/primates/project.xml
===================================================================
--- branches/forge/rysiek/portal-extensions/primates/project.xml 2005-10-11 15:59:18 UTC (rev 1370)
+++ branches/forge/rysiek/portal-extensions/primates/project.xml 2005-10-11 18:46:38 UTC (rev 1371)
@@ -35,5 +35,6 @@
<artifactId>forge-common</artifactId>
<version>1.0</version>
</dependency>
+
</dependencies>
</project>
Modified: branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/Primate.java
===================================================================
--- branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/Primate.java 2005-10-11 15:59:18 UTC (rev 1370)
+++ branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/Primate.java 2005-10-11 18:46:38 UTC (rev 1371)
@@ -1,35 +1,32 @@
package org.jbosslabs.portlets.primates;
// asdfasdf
+import java.io.File;
import java.util.HashSet;
import java.util.Set;
-import org.jboss.forge.common.ForgeHelper;
import org.jboss.forge.common.XmlTools;
import org.jboss.forge.common.projects.AbstractDescriptor;
-import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.common.projects.ProjectsHelper;
-import org.jboss.forge.common.projects.permissions.PermissionsChecker;
-import org.jboss.forge.common.projects.permissions.RenderRequestPermissionsChecker;
import org.jboss.portal.common.context.DelegateContext;
-import org.jboss.portal.core.model.User;
-import org.jboss.portlet.JBossRenderRequest;
+import org.jboss.shotoku.ContentManager;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
* @author Damon Sicore
* @author adamw
+ * @author Rysiek
* A class representing a primate.
*/
public class Primate extends AbstractDescriptor {
- final static String NAME_ELEMENT = "link";
+ final static String NAME_ELEMENT = "name";
final static String TITLE_ELEMENT = "title";
- final static String PROJECTS_ELEMENT = "projects";
final static String PROJECT_ELEMENT = "project";
+ final static String PROJECTS_ELEMENT = "projects";
final static String MUGSHOT_ELEMENT = "mugshot";
final static String STATUS_ELEMENT = "status";
- final static String BIO_ELEMENT = "bio";
+ final static String BIO_ELEMENT = "bio";
+ final static String COUNTRY_ELEMENT = "country";
/**
* <code>name</code> - The name this filthy primate calls itself.
@@ -48,6 +45,10 @@
*/
private String status;
/**
+ * <code>country</code> - Primate country.
+ */
+ private String country;
+ /**
* <code>bio</code> - More self-promotion and hot air.
*/
private String bio;
@@ -59,6 +60,7 @@
public Primate(Node root) {
NodeList nodes = root.getChildNodes();
+ allProjects = new HashSet<String>();
for (int i = 0; i < nodes.getLength(); i++) {
Node n = nodes.item(i);
@@ -69,10 +71,18 @@
name = XmlTools.unmarshallText(n);
} else if (TITLE_ELEMENT.equals(nodeName)) {
title = XmlTools.unmarshallText(n);
- } else if (PROJECT_ELEMENT.equals(nodeName)) {
- allProjects.add(XmlTools.unmarshallText(n));
} else if (MUGSHOT_ELEMENT.equals(nodeName)) {
- mugshot = XmlTools.unmarshallText(n);
+ mugshot = XmlTools.unmarshallText(n);
+ } else if (COUNTRY_ELEMENT.equals(nodeName)) {
+ country = XmlTools.unmarshallText(n);
+ } else if (PROJECTS_ELEMENT.equals(nodeName)) {
+ NodeList projectList = n.getChildNodes();
+ for (int j = 0; j < projectList.getLength(); j++) {
+ Node project = projectList.item(j);
+ if (project.getNodeType()==Node.ELEMENT_NODE && PROJECT_ELEMENT.equals(project.getNodeName())) {
+ allProjects.add(XmlTools.unmarshallText(project));
+ }
+ }
} else if (STATUS_ELEMENT.equals(nodeName)) {
status = XmlTools.unmarshallText(n);
} else if (BIO_ELEMENT.equals(nodeName)) {
@@ -81,4 +91,25 @@
}
}
}
+
+ /**
+ * Method puts primate in the context.
+ * @param portalName
+ * @param context
+ */
+ public void setPrimateContextValues (String portalName, DelegateContext context) {
+ context.put(NAME_ELEMENT,name);
+ context.put(TITLE_ELEMENT,title);
+ if (allProjects.size()>0) {
+ for (String project:allProjects) {
+ DelegateContext projectCtx = context.next(PROJECTS_ELEMENT);
+ projectCtx.put(PROJECT_ELEMENT,project);
+ }
+ }
+ context.put(MUGSHOT_ELEMENT,PrimatesTools.getImgCmPath(portalName) + File.separator + mugshot);
+ context.put(COUNTRY_ELEMENT,country);
+ context.put(STATUS_ELEMENT,status);
+ ContentManager cm = ContentManager.getContentManager();
+ context.put(BIO_ELEMENT,cm.getNode(PrimatesTools.getBiosCmPath(portalName)+File.separator+bio).getContent());
+ }
}
Modified: branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/Primates.java
===================================================================
--- branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/Primates.java 2005-10-11 15:59:18 UTC (rev 1370)
+++ branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/Primates.java 2005-10-11 18:46:38 UTC (rev 1371)
@@ -1,17 +1,17 @@
package org.jbosslabs.portlets.primates;
+import java.util.ArrayList;
import java.util.List;
-import java.util.ArrayList;
-import java.util.Set;
+import java.util.Random;
import org.jboss.portal.common.context.DelegateContext;
-import org.jboss.portlet.JBossRenderRequest;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
* @author Damon Sicore
* @author adamw
+ * @author Rysiek
* A class holding other primates.
*/
public class Primates {
@@ -37,5 +37,31 @@
}
}
}
+
+ /*
+ * Returns DelegateContext object containing all primates.
+ */
+ public DelegateContext getPrimatesContext (String portalName) {
+ DelegateContext context = new DelegateContext();
+ DelegateContext primateCtx=null;
+ for (Primate primate:primates) {
+ primateCtx=context.next("primate");
+ primate.setPrimateContextValues(portalName,primateCtx);
+ }
+ return context;
+ }
+
+ /*
+ * Returns DelegateContext object containging one random primate.
+ */
+ public DelegateContext getRandomPrimateCtx (String portalName) {
+ DelegateContext context = new DelegateContext();
+ Random random = new Random();
+ int rndNbr = random.nextInt(primates.size());
+ Primate primate = primates.get(rndNbr);
+ DelegateContext primateCtx = context.next("primate");
+ primate.setPrimateContextValues(portalName,primateCtx);
+ return context;
+ }
}
Modified: branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesDescriptor.java
===================================================================
--- branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesDescriptor.java 2005-10-11 15:59:18 UTC (rev 1370)
+++ branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesDescriptor.java 2005-10-11 18:46:38 UTC (rev 1371)
@@ -1,14 +1,8 @@
package org.jbosslabs.portlets.primates;
-import java.util.HashSet;
-import java.util.Set;
-
import org.apache.xerces.parsers.DOMParser;
-import org.jboss.forge.common.ForgeHelper;
-import org.jboss.forge.common.content.ContentManager;
-import org.jboss.forge.common.projects.ProjectsHelper;
import org.jboss.portal.common.context.DelegateContext;
-import org.jboss.portlet.JBossRenderRequest;
+import org.jboss.shotoku.ContentManager;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
@@ -25,7 +19,7 @@
try {
// Parsing the xml navigation descriptor.
DOMParser parser = new DOMParser();
- parser.parse(new InputSource(cm.getInputStream(PrimatesTools.getXmlCmPath(portalName))));
+ parser.parse(new InputSource(cm.getNode(PrimatesTools.getXmlCmPath(portalName)).getContentInputStream()));
Document doc = parser.getDocument();
// Looking for the root menu element.
Node root = doc.getDocumentElement();
@@ -39,13 +33,18 @@
}
}
- public DelegateContext getContext(JBossRenderRequest request) {
- String requestedLink = null;
-
- // Creating a context specific to this request.
- DelegateContext context = new DelegateContext();
- return context;
+ /**
+ * Returns DelegateContext object containing all primates.
+ */
+ public DelegateContext getContext(String portalName) {
+ return primates.getPrimatesContext(portalName);
}
-
+ /*
+ * Returns DelegateContext objcet containing one random primate.
+ */
+ public DelegateContext getRandomPrimateCtx (String portalName) {
+ return primates.getRandomPrimateCtx(portalName);
+ }
+
}
Modified: branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesNodeWatcher.java
===================================================================
--- branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesNodeWatcher.java 2005-10-11 15:59:18 UTC (rev 1370)
+++ branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesNodeWatcher.java 2005-10-11 18:46:38 UTC (rev 1371)
@@ -1,6 +1,6 @@
package org.jbosslabs.portlets.primates;
-import org.jboss.forge.common.content.ContentManager;
+import org.jboss.shotoku.ContentManager;
import org.jboss.forge.common.service.NodeWatcher;
import org.jboss.forge.common.service.ResourceWatcher;
Modified: branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesPortlet.java
===================================================================
--- branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesPortlet.java 2005-10-11 15:59:18 UTC (rev 1370)
+++ branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesPortlet.java 2005-10-11 18:46:38 UTC (rev 1371)
@@ -13,27 +13,34 @@
import org.jboss.portlet.JBossRenderRequest;
import org.jboss.portlet.JBossRenderResponse;
+
/**
* @author adamw
+ * @author Rysiek
* Primates portlet.
*/
public class PrimatesPortlet extends JBossPortlet {
public void doView(JBossRenderRequest request, JBossRenderResponse response)
throws IOException, PortletException {
response.setContentType("text/html");
-
String portalName = ForgeHelper.getPortalName(request);
-
ProjectsHelper.prepareRequest(request);
-
- // Getting the primates context.
- DelegateContext navContext = PrimatesTools.getDesc(portalName).getContext(request);
-
+
+ // Getting the context containing random primate.
+ DelegateContext primatesContext = PrimatesTools.getDesc(portalName).getRandomPrimateCtx(portalName);
+
+ // Getting the context containing all primates.
+ //DelegateContext primatesContext = PrimatesTools.getDesc(portalName).getContext(portalName);
+
// Displaying.
- request.setAttribute(PortalJsp.CTX_REQUEST, navContext);
-
- PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher(
- ForgeHelper.createRepoAccessPath(portalName, PrimatesTools.getJspCmPath()));
+ request.setAttribute(PortalJsp.CTX_REQUEST, primatesContext);
+
+ // Getting JSP from portlet context.
+ //PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/primates.jsp");
+
+ // Getting JSP file from cms.
+ PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher(ForgeHelper.createRepoAccessPath(portalName, PrimatesTools.getJspCmPath()));
+
rd.include(request, response);
}
}
Modified: branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesTools.java
===================================================================
--- branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesTools.java 2005-10-11 15:59:18 UTC (rev 1370)
+++ branches/forge/rysiek/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesTools.java 2005-10-11 18:46:38 UTC (rev 1371)
@@ -2,7 +2,7 @@
import org.jboss.forge.common.ForgeHelper;
import java.io.File;
-import org.jboss.forge.common.content.ContentManager;
+import org.jboss.shotoku.ContentManager;
/**
* @author adamw
@@ -14,22 +14,50 @@
private final static String PRIMATES_XML = "primates.xml";
private final static String PRIMATES_JSP = "primates.jsp";
private final static String PRIMATES_DIR = "primates";
- private final static String BIOS_DIR = PRIMATES_DIR + File.separator +"html";
- private final static String MUGSHOTS_DIR = PRIMATES_DIR + File.separator +"mugshots";
+ private final static String BIOS_DIR = "html";
+ private final static String MUGSHOTS_DIR = "images";
private static ContentManager cm;
static {
cm = ForgeHelper.getContentManager("");
}
-
+
+ /**
+ * Method returns path to XML file.
+ * @param portalName
+ * @return
+ */
static String getXmlCmPath(String portalName) {
- return portalName + "/" + PRIMATES_DIR + "/" + PRIMATES_XML;
+ return portalName + File.separator + PRIMATES_DIR + File.separator + PRIMATES_XML;
}
-
+
+ /**
+ * Method returns path to JSP file.
+ * @param portalName
+ * @return
+ */
static String getJspCmPath() {
- return PRIMATES_DIR + "/" + PRIMATES_JSP;
+ return PRIMATES_DIR + File.separator + PRIMATES_JSP;
}
+
+ /**
+ * Method returns images directory path.
+ * @param portalName
+ * @return
+ */
+ static String getImgCmPath(String portalName) {
+ return PRIMATES_DIR + File.separator +MUGSHOTS_DIR;
+ }
+
+ /**
+ * Method returns path to Bios directory.
+ * @param portalName
+ * @return
+ */
+ static String getBiosCmPath(String portalName) {
+ return portalName+File.separator+PRIMATES_DIR + File.separator +BIOS_DIR;
+ }
static synchronized PrimatesDescriptor getDesc(final String portalName) {
PrimatesDescriptor desc = (PrimatesDescriptor) ForgeHelper
Modified: branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/jboss-app.xml
===================================================================
--- branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/jboss-app.xml 2005-10-11 15:59:18 UTC (rev 1370)
+++ branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/jboss-app.xml 2005-10-11 18:46:38 UTC (rev 1371)
@@ -1,3 +1,3 @@
<jboss-app>
- <app-name>whuffie</app-name>
+ <app-name>primates</app-name>
</jboss-app>
Modified: branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/jboss-portlet.xml
===================================================================
--- branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/jboss-portlet.xml 2005-10-11 15:59:18 UTC (rev 1370)
+++ branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/jboss-portlet.xml 2005-10-11 18:46:38 UTC (rev 1371)
@@ -1,6 +1,6 @@
<portlet-app>
<portlet>
- <portlet-name>WhuffiePortlet</portlet-name>
+ <portlet-name>PrimatesPortlet</portlet-name>
<security></security>
</portlet>
</portlet-app>
Added: branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/jsp/primates.jsp
===================================================================
--- branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/jsp/primates.jsp 2005-10-11 15:59:18 UTC (rev 1370)
+++ branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/jsp/primates.jsp 2005-10-11 18:46:38 UTC (rev 1371)
@@ -0,0 +1,36 @@
+<!--
+ JBoss, the OpenSource J2EE webOS
+ Distributable under LGPL license.
+ See terms of license at gnu.org.
+ -->
+<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
+ <%@ taglib uri="/WEB-INF/tld/portlet.tld" prefix="n" %>
+ <%@ taglib uri="/WEB-INF/tld/forge.tld" prefix="forge" %>
+ <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+ <%@ page isELIgnored ="false" %>
+ <portlet:defineObjects/>
+
+ <h1>Random Primate</h1>
+<div id="blog-entry">
+
+<n:iterate ctx="primate">
+ <!-- iterated menuentry -->
+ <div class="item">
+ <img src="<forge:imagePath src="${n:out('primate.mugshot')}" />" border="0" />
+ <h3>name:</h3> ${n:out('primate.name')}
+ <h3>title:</h3> ${n:out('primate.title')}
+ <h3>bio:</h3> ${n:out('primate.bio')}
+ <h3>status:</h3> ${n:out("primate.status")}
+ <h3>country:</h3> ${n:out("primate.country")}
+ <n:iterate ctx="projects">
+ <h3>project:</h3> ${n:out("primate.projects.project")}
+ <BR />
+ </n:iterate>
+ <hr>
+ </div>
+</n:iterate>
+
+
+</div>
+
+
Modified: branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/portlet-instances.xml 2005-10-11 15:59:18 UTC (rev 1370)
+++ branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/portlet-instances.xml 2005-10-11 18:46:38 UTC (rev 1371)
@@ -1,7 +1,7 @@
<?xml version="1.0" standalone="yes"?>
<instances>
<instance>
- <instance-name>WhuffiePortletInstance</instance-name>
- <component-ref>WhuffiePortlet</component-ref>
+ <instance-name>PrimatesPortletInstance</instance-name>
+ <component-ref>PrimatesPortlet</component-ref>
</instance>
</instances>
Modified: branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/portlet.xml
===================================================================
--- branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/portlet.xml 2005-10-11 15:59:18 UTC (rev 1370)
+++ branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/portlet.xml 2005-10-11 18:46:38 UTC (rev 1371)
@@ -3,15 +3,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd /opt/SUNWps/dtd/portlet.xsd" version="1.0">
<portlet>
- <portlet-name>WhuffiePortlet</portlet-name>
- <portlet-class>org.jbosslabs.portlets.whuffie.WhuffiePortlet</portlet-class>
+ <portlet-name>PrimatesPortlet</portlet-name>
+ <portlet-class>org.jbosslabs.portlets.primates.PrimatesPortlet</portlet-class>
<supported-locale>en</supported-locale>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
</supports>
<portlet-info>
- <title>JBoss Whuffie Portlet</title>
+ <title>JBoss Primates Portlet</title>
</portlet-info>
</portlet>
</portlet-app>
Modified: branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/web.xml
===================================================================
--- branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/web.xml 2005-10-11 15:59:18 UTC (rev 1370)
+++ branches/forge/rysiek/portal-extensions/primates/src/web/WEB-INF/web.xml 2005-10-11 18:46:38 UTC (rev 1371)
@@ -3,4 +3,14 @@
"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
+ <filter>
+ <filter-name>filesFromRepoFilter</filter-name>
+ <filter-class>org.jboss.forge.common.FilesFromRepoFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>filesFromRepoFilter</filter-name>
+ <url-pattern>/repo-access/*</url-pattern>
+ <dispatcher>INCLUDE</dispatcher>
+ </filter-mapping>
</web-app>
|
|
From: <jbo...@li...> - 2005-10-11 15:59:13
|
Author: szimano
Date: 2005-10-11 11:59:18 -0400 (Tue, 11 Oct 2005)
New Revision: 1370
Modified:
trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java
trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/ATOMPlugin.java
trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminRenamingPlugin.java
trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/DifferenceEngine.java
trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RSSPlugin.java
Log:
cleared wrong imports
Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java 2005-10-11 15:51:57 UTC (rev 1369)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java 2005-10-11 15:59:18 UTC (rev 1370)
@@ -115,6 +115,7 @@
}
public boolean pageExists(String pageName) {
+ System.out.println("pageEx: "+pageName);
return mediaDataSource.pageExists(getUid(pageName));
}
Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/ATOMPlugin.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/ATOMPlugin.java 2005-10-11 15:51:57 UTC (rev 1369)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/ATOMPlugin.java 2005-10-11 15:59:18 UTC (rev 1370)
@@ -1,10 +1,5 @@
package org.jboss.wiki.plugins;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.util.Date;
import org.jboss.wiki.WikiPage;
Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminRenamingPlugin.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminRenamingPlugin.java 2005-10-11 15:51:57 UTC (rev 1369)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminRenamingPlugin.java 2005-10-11 15:59:18 UTC (rev 1370)
@@ -10,8 +10,6 @@
import org.jboss.wiki.WikiSession;
import org.jboss.wiki.exceptions.WikiException;
-import sun.security.krb5.internal.crypto.w;
-
public class AdminRenamingPlugin extends WikiPlugin {
public final String RENAME_CAPTION = "Rename";
Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/DifferenceEngine.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/DifferenceEngine.java 2005-10-11 15:51:57 UTC (rev 1369)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/DifferenceEngine.java 2005-10-11 15:59:18 UTC (rev 1370)
@@ -49,9 +49,7 @@
package org.jboss.wiki.plugins;
-import java.util.Properties;
import java.util.Vector;
-import java.io.File;
import java.io.IOException;
import java.io.BufferedReader;
import java.io.StringReader;
Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RSSPlugin.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RSSPlugin.java 2005-10-11 15:51:57 UTC (rev 1369)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RSSPlugin.java 2005-10-11 15:59:18 UTC (rev 1370)
@@ -1,11 +1,5 @@
package org.jboss.wiki.plugins;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.net.MalformedURLException;
-import java.net.URL;
-
import org.jboss.wiki.WikiPage;
import org.jboss.wiki.WikiPlugin;
|
|
From: <jbo...@li...> - 2005-10-11 15:51:50
|
Author: szimano
Date: 2005-10-11 11:51:57 -0400 (Tue, 11 Oct 2005)
New Revision: 1369
Modified:
trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java
trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminRenamingPlugin.java
trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/ReTranslateUids.java
Log:
removed some strange import
Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java 2005-10-11 15:30:17 UTC (rev 1368)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiEngine.java 2005-10-11 15:51:57 UTC (rev 1369)
@@ -624,7 +624,7 @@
public String getRealName(String uid) {
String[] pageTokens = uid.split("/");
- System.out.println("Looking at page: (realName) "+uid);
+ //System.out.println("Looking at page: (realName) "+uid);
if (pageTokens.length > 1) {
if (!wikiPageDictionary.getRealName(uid).equals(uid)) {
@@ -632,7 +632,7 @@
// this page is in dictionary
return wikiPageDictionary.getRealName(uid);
} else {
- System.out.println("checking parts");
+ //System.out.println("checking parts");
// look if parts of this page are in dictionary
for (int i = pageTokens.length - 1; i > 0; i--) {
Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminRenamingPlugin.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminRenamingPlugin.java 2005-10-11 15:30:17 UTC (rev 1368)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminRenamingPlugin.java 2005-10-11 15:51:57 UTC (rev 1369)
@@ -8,15 +8,36 @@
import org.jboss.wiki.WikiPage;
import org.jboss.wiki.WikiPlugin;
import org.jboss.wiki.WikiSession;
+import org.jboss.wiki.exceptions.WikiException;
+import sun.security.krb5.internal.crypto.w;
+
public class AdminRenamingPlugin extends WikiPlugin {
+ public final String RENAME_CAPTION = "Rename";
@Override
public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) {
Credentials credentials = (Credentials)wikiSession.getAttribute("credentials");
StringBuilder adminContent = new StringBuilder("<h3>Admin</h3><br />\n");
if (credentials.isAdmin()) {
+
+ if((wikiSession.getAttribute("var1") != null)&&(wikiSession.getAttribute("var1").equals(RENAME_CAPTION))) {
+ if ((wikiSession.getAttribute("var2") != null)&&(wikiSession.getAttribute("var3") != null)) {
+ String oldName = (String)wikiSession.getAttribute("var2");
+ String uid = wikiEngine.getUid(oldName);
+ String newName = (String)wikiSession.getAttribute("var3");
+
+ System.out.println("oldname: "+oldName+"\nuid: "+uid+"\nnewName: "+newName);
+ try {
+ wikiEngine.rename(uid, newName);
+ adminContent.append("Added renaming from page: ").append(oldName).append(" to page: ").append(newName).append("<br />\n");
+ } catch (WikiException e) {
+ adminContent.append("Couldn't rename page because: ").append(e.getMessage()).append("<br />\n");
+ e.printStackTrace();
+ }
+ }
+ }
String actionURL = (String)wikiSession.getAttribute("actionURL");
HashMap<String,String> pagesWaiting = wikiEngine.getPagesWaiting();
@@ -34,13 +55,13 @@
Set<String> allPages = wikiEngine.getAllPageNames();
adminContent.append("<form method=\"POST\" action=\"").append(actionURL).append("&type=admin \" >\n");
- adminContent.append("<select name=\"renameFrom\" >\n");
+ adminContent.append("<select name=\"var2\" >\n");
for (String pageName : allPages) {
adminContent.append("<option>").append(pageName).append("</option>\n");
}
adminContent.append("</select>\n");
- adminContent.append(" rename to ").append("<input type=\"text\" name=\"renameTo\" />").append("<input type=\"submit\" name=\"btn\" value=\"Rename\" />\n");
+ adminContent.append(" rename to ").append("<input type=\"text\" name=\"var3\" />").append("<input type=\"submit\" name=\"var1\" value=\"").append(RENAME_CAPTION).append("\" />\n");
adminContent.append("</form>\n");
}
else {
Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/ReTranslateUids.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/ReTranslateUids.java 2005-10-11 15:30:17 UTC (rev 1368)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/ReTranslateUids.java 2005-10-11 15:51:57 UTC (rev 1369)
@@ -2,8 +2,6 @@
import org.jboss.wiki.WikiEngine;
-import sun.security.krb5.internal.crypto.w;
-
public class ReTranslateUids extends TranslateUids {
//this class only inherties this one method to retranslate all the urls
|
|
From: <jbo...@li...> - 2005-10-11 15:30:16
|
Author: aron.gombas Date: 2005-10-11 11:30:17 -0400 (Tue, 11 Oct 2005) New Revision: 1368 Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/model/CcBuildStatus.java trunk/labs/kosmos/src/java/hu/midori/kosmos/model/CcTestResult.java Log: Javadoc fix Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/model/CcBuildStatus.java =================================================================== --- trunk/labs/kosmos/src/java/hu/midori/kosmos/model/CcBuildStatus.java 2005-10-11 13:58:11 UTC (rev 1367) +++ trunk/labs/kosmos/src/java/hu/midori/kosmos/model/CcBuildStatus.java 2005-10-11 15:30:17 UTC (rev 1368) @@ -7,7 +7,7 @@ package hu.midori.kosmos.model; /** - * Represent the status of a <i>CruiseControl</i> build. + * Represents the status of a <i>CruiseControl</i> build. * <p>This should be a Java 5 enum, but enumerated types can't be serialized * and sent through Hessian, so it's a plain old-style Java constant for now. * Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/model/CcTestResult.java =================================================================== --- trunk/labs/kosmos/src/java/hu/midori/kosmos/model/CcTestResult.java 2005-10-11 13:58:11 UTC (rev 1367) +++ trunk/labs/kosmos/src/java/hu/midori/kosmos/model/CcTestResult.java 2005-10-11 15:30:17 UTC (rev 1368) @@ -7,7 +7,7 @@ package hu.midori.kosmos.model; /** - * Represent the result of a <i>CruiseControl</i> unit test. + * Represents the result of a <i>CruiseControl</i> unit test. * <p>This should be a Java 5 enum, but enumerated types can't be serialized * and sent through Hessian, so it's a plain old-style Java constant for now. * |
|
From: <jbo...@li...> - 2005-10-11 13:58:08
|
Author: szimano Date: 2005-10-11 09:58:11 -0400 (Tue, 11 Oct 2005) New Revision: 1367 Modified: trunk/forge/portal-extensions/jbosswiki/maven.xml Log: clean for wiki Modified: trunk/forge/portal-extensions/jbosswiki/maven.xml =================================================================== --- trunk/forge/portal-extensions/jbosswiki/maven.xml 2005-10-11 13:54:24 UTC (rev 1366) +++ trunk/forge/portal-extensions/jbosswiki/maven.xml 2005-10-11 13:58:11 UTC (rev 1367) @@ -19,6 +19,13 @@ <attainGoal name="wiki:deploy" /> </goal> + <goal name="clean"> + <ant:delete dir="target" /> + <ant:delete dir="wiki-common/target" /> + <ant:delete dir="wiki-management/target" /> + <ant:delete dir="forge-wiki/target" /> + </goal> + <goal name="wiki:build"> <maven:reactor includes="jbosswiki/wiki-common/project.xml" excludes="" basedir="." banner="Making wiki-common for the repo" |
|
From: <jbo...@li...> - 2005-10-11 13:54:15
|
Author: dam...@jb... Date: 2005-10-11 09:54:24 -0400 (Tue, 11 Oct 2005) New Revision: 1366 Modified: trunk/forge/portal-extensions/ trunk/forge/portal-extensions/federation-register/ trunk/forge/portal-extensions/forge-ads/ trunk/forge/portal-extensions/forge-blog/ trunk/forge/portal-extensions/forge-common/ trunk/forge/portal-extensions/forge-contributor/ trunk/forge/portal-extensions/forge-ear/ trunk/forge/portal-extensions/forge-file-access/ trunk/forge/portal-extensions/forge-login/ trunk/forge/portal-extensions/forge-map/ trunk/forge/portal-extensions/forge-navigation/ trunk/forge/portal-extensions/forge-prj-downloads/ trunk/forge/portal-extensions/forge-prj-info/ trunk/forge/portal-extensions/forge-root-redirect/ trunk/forge/portal-extensions/forge-service/ trunk/forge/portal-extensions/forge-theme/ trunk/forge/portal-extensions/forge-wiki/ Log: More svn:ignore settings. Property changes on: trunk/forge/portal-extensions ___________________________________________________________________ Name: svn:ignore - .svnignore build.properties target *.iml *.ipr + .svnignore .project-svnignore build.properties target *.iml *.ipr *.iws Property changes on: trunk/forge/portal-extensions/federation-register ___________________________________________________________________ Name: svn:ignore - target .classpath .project .settings + .svnignore target .classpath .project *.iml *.iws *.ipr Property changes on: trunk/forge/portal-extensions/forge-ads ___________________________________________________________________ Name: svn:ignore - output target .classpath .settings .project + .svnignore target .classpath .project *.iml *.iws *.ipr Property changes on: trunk/forge/portal-extensions/forge-blog ___________________________________________________________________ Name: svn:ignore - .classpath .project .settings target + .svnignore target .classpath .project *.iml *.iws *.ipr Property changes on: trunk/forge/portal-extensions/forge-common ___________________________________________________________________ Name: svn:ignore - .classpath .project .settings target + .svnignore target .classpath .project *.iml *.iws *.ipr Property changes on: trunk/forge/portal-extensions/forge-contributor ___________________________________________________________________ Name: svn:ignore - target .classpath .project .settings + .svnignore target .classpath .project *.iml *.iws *.ipr Property changes on: trunk/forge/portal-extensions/forge-ear ___________________________________________________________________ Name: svn:ignore - target + .svnignore target .classpath .project *.iml *.iws *.ipr Property changes on: trunk/forge/portal-extensions/forge-file-access ___________________________________________________________________ Name: svn:ignore - target .project .classpath .settings + .svnignore target .classpath .project *.iml *.iws *.ipr Property changes on: trunk/forge/portal-extensions/forge-login ___________________________________________________________________ Name: svn:ignore - target .classpath .settings .project + .svnignore target .classpath .project *.iml *.iws *.ipr Property changes on: trunk/forge/portal-extensions/forge-map ___________________________________________________________________ Name: svn:ignore - target .classpath .settings .project + .svnignore target .classpath .project *.iml *.iws *.ipr Property changes on: trunk/forge/portal-extensions/forge-navigation ___________________________________________________________________ Name: svn:ignore - target build.properties .classpath .settings .project + .svnignore target .classpath .project *.iml *.iws *.ipr Property changes on: trunk/forge/portal-extensions/forge-prj-downloads ___________________________________________________________________ Name: svn:ignore - target .classpath .settings .project + .svnignore target .classpath .project *.iml *.iws *.ipr Property changes on: trunk/forge/portal-extensions/forge-prj-info ___________________________________________________________________ Name: svn:ignore - target .settings .classpath .project + .svnignore target .classpath .project *.iml *.iws *.ipr Property changes on: trunk/forge/portal-extensions/forge-root-redirect ___________________________________________________________________ Name: svn:ignore - target .classpath .project .settings + .svnignore target .classpath .project *.iml *.iws *.ipr Property changes on: trunk/forge/portal-extensions/forge-service ___________________________________________________________________ Name: svn:ignore - .project .settings .classpath target + .svnignore target .classpath .project *.iml *.iws *.ipr Property changes on: trunk/forge/portal-extensions/forge-theme ___________________________________________________________________ Name: svn:ignore - target + .svnignore target .classpath .project *.iml *.iws *.ipr Property changes on: trunk/forge/portal-extensions/forge-wiki ___________________________________________________________________ Name: svn:ignore - target + .svnignore target .classpath .project *.iml *.iws *.ipr |
|
From: <jbo...@li...> - 2005-10-11 13:44:53
|
Author: dam...@jb... Date: 2005-10-11 09:45:01 -0400 (Tue, 11 Oct 2005) New Revision: 1365 Modified: trunk/forge/portal-extensions/forge-jspwiki/ Log: set the ignore. Property changes on: trunk/forge/portal-extensions/forge-jspwiki ___________________________________________________________________ Name: svn:ignore - target .classpath .project + .svnignore target .classpath .project *.iml *.iws *.ipr |
|
From: <jbo...@li...> - 2005-10-11 13:41:58
|
Author: dam...@jb... Date: 2005-10-11 09:42:08 -0400 (Tue, 11 Oct 2005) New Revision: 1364 Modified: trunk/forge/portal-extensions/ Log: Set the svn:ignore.. Property changes on: trunk/forge/portal-extensions ___________________________________________________________________ Name: svn:ignore - build.properties target + .svnignore build.properties target *.iml *.ipr |
|
From: <jbo...@li...> - 2005-10-11 11:38:24
|
Author: aron.gombas
Date: 2005-10-11 07:38:32 -0400 (Tue, 11 Oct 2005)
New Revision: 1363
Modified:
trunk/labs/kosmos/web-server/WEB-INF/web.xml
Log:
Minor typo fixes
Modified: trunk/labs/kosmos/web-server/WEB-INF/web.xml
===================================================================
--- trunk/labs/kosmos/web-server/WEB-INF/web.xml 2005-10-11 11:37:55 UTC (rev 1362)
+++ trunk/labs/kosmos/web-server/WEB-INF/web.xml 2005-10-11 11:38:32 UTC (rev 1363)
@@ -6,8 +6,8 @@
<!-- $Id$ -->
<web-app>
- <display-name>Kosmos services servlet</display-name>
- <description>Server component of Kosmos</description>
+ <display-name>Kosmos Services Servlet</display-name>
+ <description>Server component of Kosmos.</description>
<!-- Both HTTP and HTTPS protocol can be used here. -->
<context-param>
|
|
From: <jbo...@li...> - 2005-10-11 11:37:48
|
Author: aron.gombas Date: 2005-10-11 07:37:55 -0400 (Tue, 11 Oct 2005) New Revision: 1362 Modified: trunk/labs/kosmos/conf-portlet/gridsphere/web.xml Log: GS web.xml upgraded to 2.4 Modified: trunk/labs/kosmos/conf-portlet/gridsphere/web.xml =================================================================== --- trunk/labs/kosmos/conf-portlet/gridsphere/web.xml 2005-10-11 10:47:25 UTC (rev 1361) +++ trunk/labs/kosmos/conf-portlet/gridsphere/web.xml 2005-10-11 11:37:55 UTC (rev 1362) @@ -1,9 +1,10 @@ <?xml version="1.0"?> -<!DOCTYPE web-app PUBLIC - "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" - "http://java.sun.com/dtd/web-app_2_3.dtd"> -<web-app> +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee web-app_2_4.xsd" + version="2.4"> + <!-- JSTL configuration --> <context-param> <param-name>javax.servlet.jsp.jstl.fmt.locale</param-name> @@ -12,6 +13,10 @@ <!-- JSP configuration --> <taglib> + <taglib-uri>http://labs.jboss.com/projects/kosmos</taglib-uri> + <taglib-location>/WEB-INF/tld/kosmos-taglib.tld</taglib-location> + </taglib> + <taglib> <taglib-uri>http://displaytag.sf.net/el</taglib-uri> <taglib-location>/WEB-INF/tld/displaytag-el-12.tld</taglib-location> </taglib> |
|
From: <jbo...@li...> - 2005-10-11 10:48:08
|
Author: aron.gombas Date: 2005-10-11 06:47:25 -0400 (Tue, 11 Oct 2005) New Revision: 1361 Modified: trunk/labs/kosmos/web-portlet/pages/images/kosmos_logo.png trunk/labs/kosmos/web-portlet/pages/includes/about.jsp trunk/labs/kosmos/xdocs/reference/images/kosmos_logo.png Log: Logo updated Modified: trunk/labs/kosmos/web-portlet/pages/images/kosmos_logo.png =================================================================== (Binary files differ) Modified: trunk/labs/kosmos/web-portlet/pages/includes/about.jsp =================================================================== --- trunk/labs/kosmos/web-portlet/pages/includes/about.jsp 2005-10-11 09:55:55 UTC (rev 1360) +++ trunk/labs/kosmos/web-portlet/pages/includes/about.jsp 2005-10-11 10:47:25 UTC (rev 1361) @@ -1,4 +1,5 @@ <p class="portlet-section-footer"> - <a href="http://labs.jboss.com/projects/kosmos"><img src="<%= renderRequest.getContextPath() %>/pages/images/kosmos_logo.png" border="0"/></a><br/> + <a href="http://labs.jboss.com/projects/kosmos"><img src="<%= renderRequest.getContextPath() %>/pages/images/kosmos_logo.png" border="0"/></a> + <br/><br/> <a href="http://labs.jboss.com/projects/kosmos">@project.name@</a> @project.version@ (@build.date@) </p> \ No newline at end of file Modified: trunk/labs/kosmos/xdocs/reference/images/kosmos_logo.png =================================================================== (Binary files differ) |
|
From: <jbo...@li...> - 2005-10-11 09:55:47
|
Author: aron.gombas
Date: 2005-10-11 05:55:55 -0400 (Tue, 11 Oct 2005)
New Revision: 1360
Modified:
trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java
Log:
Little fix
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java 2005-10-11 09:49:00 UTC (rev 1359)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java 2005-10-11 09:55:55 UTC (rev 1360)
@@ -128,7 +128,7 @@
// init cache: create WebDAV collection if not existing
WebdavResource root = new WebdavResource(webdavUrl);
- WebdavResource cacheDir = root.getChildResources().getResource("kosmos-cache");
+ WebdavResource cacheDir = root.getChildResources().getResource(cacheDirName);
if(cacheDir == null) {
if(!isHttps) { // TODO using this with https throws an exception?
root.mkcolMethod(cacheDirName);
|
550 messages has been excluded from this view by a project administrator.
