Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4537 - in labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions: forge-ear/src/META-INF forge-kosmos forge-kosmos/conf/portlet forge-kosmos/conf/server forge-wiki/src/etc/org/jboss/wiki
Author: dam...@jb... Date: 2006-05-31 21:42:02 -0400 (Wed, 31 May 2006) New Revision: 4537 Modified: labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-ear/src/META-INF/application.xml labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-kosmos/conf/portlet/portlet.xml labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-kosmos/conf/server/kosmos-services-servlet.xml labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-kosmos/conf/server/web.xml labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-kosmos/maven.xml labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/filedatasource.properties Log: MERGED: -r 4359:4362 https://svn.labs.jboss.org/labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06 . for the 06-01-2006 promote. Modified: labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-ear/src/META-INF/application.xml =================================================================== --- labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-ear/src/META-INF/application.xml 2006-06-01 00:14:24 UTC (rev 4536) +++ labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-ear/src/META-INF/application.xml 2006-06-01 01:42:02 UTC (rev 4537) @@ -13,11 +13,12 @@ <web-uri>blog-portlet.war</web-uri> </web> </module> + <!-- DIE KOSMOS DIE <module> <web> <web-uri>kosmos-portlet.war</web-uri> </web> - </module> + </module>--> <module> <web> <web-uri>primates-portlet.war</web-uri> @@ -28,11 +29,12 @@ <web-uri>polls-portlet.war</web-uri> </web> </module> + <!-- DIE KOSMOS DIE <module> <web> <web-uri>kosmos-server.war</web-uri> </web> - </module> + </module>--> <module> <web> <web-uri>federation-register.war</web-uri> Modified: labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-kosmos/conf/portlet/portlet.xml =================================================================== --- labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-kosmos/conf/portlet/portlet.xml 2006-06-01 00:14:24 UTC (rev 4536) +++ labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-kosmos/conf/portlet/portlet.xml 2006-06-01 01:42:02 UTC (rev 4537) @@ -11,7 +11,7 @@ </init-param> <init-param> <name>service.url</name> - <value>http://localhost:8080/kosmos-server/kosmos-services/jira-service</value> + <value>http://labs.jboss.com:8080/kosmos-server/kosmos-services/jira-service</value> </init-param> <init-param> <name>monitored.urls</name> @@ -72,7 +72,7 @@ </init-param> <init-param> <name>service.url</name> - <value>http://localhost:8080/kosmos-server/kosmos-services/svn-service</value> + <value>http://labs.jboss.com:8080/kosmos-server/kosmos-services/svn-service</value> </init-param> <init-param> <name>monitored.urls</name> Modified: labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-kosmos/conf/server/kosmos-services-servlet.xml =================================================================== --- labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-kosmos/conf/server/kosmos-services-servlet.xml 2006-06-01 00:14:24 UTC (rev 4536) +++ labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-kosmos/conf/server/kosmos-services-servlet.xml 2006-06-01 01:42:02 UTC (rev 4537) @@ -4,7 +4,7 @@ <beans> <!-- CC service --> <bean id="ccService" class="hu.midori.kosmos.server.cc.CcServiceImpl"> - <property name="store" ref="labsCachedDataStore"/> + <property name="store" ref="shotokuCachedDataStore"/> </bean> <bean name="/cc-service" class="org.springframework.remoting.caucho.HessianServiceExporter"> <property name="service" ref="ccService"/> @@ -13,7 +13,7 @@ <!-- JIRA service --> <bean id="jiraService" class="hu.midori.kosmos.server.jira.JiraServiceImpl"> - <property name="store" ref="labsCachedDataStore"/> + <property name="store" ref="shotokuCachedDataStore"/> </bean> <bean name="/jira-service" class="org.springframework.remoting.caucho.HessianServiceExporter"> <property name="service" ref="jiraService"/> @@ -22,7 +22,7 @@ <!-- SF service --> <bean id="sfService" class="hu.midori.kosmos.server.sf.SfServiceImpl"> - <property name="store" ref="labsCachedDataStore"/> + <property name="store" ref="shotokuCachedDataStore"/> </bean> <bean name="/sf-service" class="org.springframework.remoting.caucho.HessianServiceExporter"> <property name="service" ref="sfService"/> @@ -31,15 +31,16 @@ <!-- SVN service --> <bean id="svnService" class="hu.midori.kosmos.server.svn.SvnServiceImpl"> - <property name="store" ref="labsCachedDataStore"/> + <property name="store" ref="shotokuCachedDataStore"/> </bean> <bean name="/svn-service" class="org.springframework.remoting.caucho.HessianServiceExporter"> <property name="service" ref="svnService"/> <property name="serviceInterface" value="hu.midori.kosmos.protocol.SvnService"/> </bean> - <!-- Labs cached data store --> - <bean id="labsCachedDataStore" class="org.jboss.kosmos.LabsCachedDataStore"> - </bean> - + <!-- Shotoku cached data store --> + <bean id="shotokuCachedDataStore" class="org.jboss.kosmos.ShotokuCachedDataStore"> + <property name="fileAccessUrl" value="http://localhost:8080/file-access"/> + <property name="prefix" value="kosmos/images/kosmos-cache"/> + </bean> </beans> \ No newline at end of file Modified: labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-kosmos/conf/server/web.xml =================================================================== --- labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-kosmos/conf/server/web.xml 2006-06-01 00:14:24 UTC (rev 4536) +++ labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-kosmos/conf/server/web.xml 2006-06-01 01:42:02 UTC (rev 4537) @@ -10,7 +10,7 @@ <context-param> <param-name>webdav.url</param-name> - <param-value>https://labs-stats:jbo...@cm.../trunk/forge/portal-content/kosmos/images</param-value> + <param-value>https://labs-stats:jbo...@cm.../prod/forge/portal-content/kosmos/images</param-value> </context-param> <context-param> <param-name>webdav.user</param-name> Modified: labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-kosmos/maven.xml =================================================================== --- labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-kosmos/maven.xml 2006-06-01 00:14:24 UTC (rev 4536) +++ labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-kosmos/maven.xml 2006-06-01 01:42:02 UTC (rev 4537) @@ -13,15 +13,18 @@ </goal> <goal name="build"> - <attainGoal name="java:compile" /> + <!-- DIE KOSMOS DIE + <attainGoal name="java:compile" /> --> </goal> <goal name="deploy"> <!-- Unzipping the jar-s --> + + <!-- DIE KOSMOS DIE <ant:unzip src="to-copy/kosmos-server.war" dest="target/kosmos-server.war" overwrite="true" /> - <ant:unzip src="to-copy/kosmos-portlet.war" dest="target/kosmos-portlet.war" overwrite="true" /> + <ant:unzip src="to-copy/kosmos-portlet.war" dest="target/kosmos-portlet.war" overwrite="true" /> --> - <!-- Copying configuration files --> + <!-- Copying configuration files DIE KOSMOS DIE <ant:copy todir="target/kosmos-server.war/WEB-INF" overwrite="true"> <ant:fileset dir="conf/server"> <ant:filename name="**/*" /> @@ -31,24 +34,25 @@ <ant:fileset dir="conf/portlet"> <ant:filename name="**/*" /> </ant:fileset> - </ant:copy> + </ant:copy> --> - <!-- Copying cache class --> + <!-- Copying cache class DIE KOSMOS DIE <ant:copy todir="target/kosmos-server.war/WEB-INF/classes" overwrite="true"> <ant:fileset dir="target/classes"> <ant:filename name="**/*" /> </ant:fileset> - </ant:copy> + </ant:copy> --> - <!-- Deleting old deployment --> + <!-- Deleting old deployment DIE KOSMOS DIE <ant:delete dir="${local.deploy.dir}/kosmos-server.war" /> <ant:delete dir="${local.deploy.dir}/kosmos-portlet.war" /> - - <!-- Deploying new packages --> + --> + + <!-- Deploying new packages DIE KOSMOS DIE <ant:copy todir="../${forge.ear.dir}/target/${forge.ear.name}" overwrite="true"> <ant:fileset dir="target"> <ant:filename name="kosmos*/**" /> </ant:fileset> - </ant:copy> + </ant:copy>--> </goal> </project> Modified: labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/filedatasource.properties =================================================================== --- labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/filedatasource.properties 2006-06-01 00:14:24 UTC (rev 4536) +++ labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/filedatasource.properties 2006-06-01 01:42:02 UTC (rev 4537) @@ -1,7 +1,7 @@ # FileDataSource configuration file # pathToMedia - points, where JSPWiki file structure is situated -pathToMedia = /usr/local/forge/wiki +pathToMedia = /services/jbf-portal/wiki # pathToAttachements - points, where JSPWiki attachemets are situated -pathToAttachements = /usr/local/forge/wiki \ No newline at end of file +pathToAttachements = /services/jbf-portal/wiki |
