From: <jbo...@li...> - 2005-12-03 22:56:12
|
Author: aron.gombas Date: 2005-12-03 17:56:02 -0500 (Sat, 03 Dec 2005) New Revision: 1689 Removed: trunk/labs/kosmos/conf-portlet/liferay-portal/portlet-deployer-3.5.0.xml Modified: trunk/labs/kosmos/conf-portlet/liferay-portal/liferay-display.xml trunk/labs/kosmos/conf-portlet/liferay-portal/liferay-portlet.xml Log: Improved Liferay config files Modified: trunk/labs/kosmos/conf-portlet/liferay-portal/liferay-display.xml =================================================================== --- trunk/labs/kosmos/conf-portlet/liferay-portal/liferay-display.xml 2005-12-03 20:43:53 UTC (rev 1688) +++ trunk/labs/kosmos/conf-portlet/liferay-portal/liferay-display.xml 2005-12-03 22:56:02 UTC (rev 1689) @@ -5,8 +5,9 @@ <category name="category.development"> <portlet id="LocalCcMonitoringPortlet" /> <portlet id="JBossJiraMonitoringPortlet" /> + <portlet id="KosmosDependenciesSfMonitoringPortlet" /> + <portlet id="KosmosToolsSfMonitoringPortlet" /> <portlet id="JBossProductsSfMonitoringPortlet" /> - <portlet id="KosmosToolsSfMonitoringPortlet" /> <portlet id="JBossSvnMonitoringPortlet" /> </category> </display> Modified: trunk/labs/kosmos/conf-portlet/liferay-portal/liferay-portlet.xml =================================================================== --- trunk/labs/kosmos/conf-portlet/liferay-portal/liferay-portlet.xml 2005-12-03 20:43:53 UTC (rev 1688) +++ trunk/labs/kosmos/conf-portlet/liferay-portal/liferay-portlet.xml 2005-12-03 22:56:02 UTC (rev 1689) @@ -15,8 +15,8 @@ <include>true</include> </portlet> <portlet> - <portlet-name>JBossProductsSfMonitoringPortlet</portlet-name> - <struts-path>sourceforge_products</struts-path> + <portlet-name>KosmosDependenciesSfMonitoringPortlet</portlet-name> + <struts-path>sourceforge_dependencies</struts-path> <use-default-template>true</use-default-template> <include>true</include> </portlet> @@ -27,6 +27,12 @@ <include>true</include> </portlet> <portlet> + <portlet-name>JBossProductsSfMonitoringPortlet</portlet-name> + <struts-path>sourceforge_products</struts-path> + <use-default-template>true</use-default-template> + <include>true</include> + </portlet> + <portlet> <portlet-name>JBossSvnMonitoringPortlet</portlet-name> <struts-path>svn</struts-path> <use-default-template>true</use-default-template> Deleted: trunk/labs/kosmos/conf-portlet/liferay-portal/portlet-deployer-3.5.0.xml =================================================================== --- trunk/labs/kosmos/conf-portlet/liferay-portal/portlet-deployer-3.5.0.xml 2005-12-03 20:43:53 UTC (rev 1688) +++ trunk/labs/kosmos/conf-portlet/liferay-portal/portlet-deployer-3.5.0.xml 2005-12-03 22:56:02 UTC (rev 1689) @@ -1,98 +0,0 @@ -<?xml version="1.0"?> - -<project name="portlet-deployer" basedir="." default="deploy"> - <target name="init"> - <property environment="env" /> - - <!-- JBoss+Jetty --> - - <!--<property name="app.server.type" value="jboss-jetty" /> - <property name="app.server.dir" value="/CVSROOT/liferay/ext/servers/${app.server.type}" /> - <property name="app.server.deploy.dir" value="${app.server.dir}/server/default/deploy" /> - <path id="project.classpath"> - <pathelement location="${app.server.deploy.dir}/ext.ear/portal-ejb.jar" /> - <pathelement location="${env.ANT_HOME}/lib/ant.jar" /> - <fileset dir="${app.server.deploy.dir}/ext.ear/lib" /> - <pathelement location="${app.server.deploy.dir}/jbossweb-jetty.sar/javax.servlet.jar" /> - </path>--> - - <!-- JBoss+Tomcat --> - - <!--<property name="app.server.type" value="jboss-tomcat" /> - <property name="app.server.dir" value="/CVSROOT/liferay/ext/servers/${app.server.type}" /> - <property name="app.server.deploy.dir" value="${app.server.dir}/server/default/deploy" /> - <path id="project.classpath"> - <pathelement location="${app.server.deploy.dir}/ext.ear/portal-ejb.jar" /> - <pathelement location="${env.ANT_HOME}/lib/ant.jar" /> - <fileset dir="${app.server.deploy.dir}/ext.ear/lib" /> - <pathelement location="${app.server.deploy.dir}/../lib/javax.servlet.jar" /> - </path>--> - - <!-- Jetty --> - - <!-- - You cannot hot deploy portlets on Jetty because it does not come with - any native hot deployers. - - See http://www.jettyserver.org/jetty/faq?s=200-General&t=HotDeploy - --> - - <!--<property name="app.server.type" value="jetty" /> - <property name="app.server.dir" value="/CVSROOT/liferay/ext/servers/${app.server.type}" /> - <property name="app.server.deploy.dir" value="${app.server.dir}/webapps" /> - <path id="project.classpath"> - <pathelement location="${env.ANT_HOME}/lib/ant.jar" /> - <fileset dir="${app.server.dir}/lib/ext" /> - <pathelement location="${app.server.dir}/lib/javax.servlet.jar" /> - </path>--> - - <!-- Resin --> - - <!--<property name="app.server.type" value="resin" /> - <property name="app.server.dir" value="/CVSROOT/liferay/ext/servers/${app.server.type}" /> - <property name="app.server.deploy.dir" value="${app.server.dir}/webapps" /> - <path id="project.classpath"> - <pathelement location="${env.ANT_HOME}/lib/ant.jar" /> - <fileset dir="${app.server.dir}/common/lib/ext" /> - <pathelement location="${app.server.dir}/lib/jsdk-24.jar" /> - </path>--> - - <!-- Tomcat --> - - <property name="app.server.type" value="tomcat" /> - <property name="app.server.dir" value="${env.CATALINA_HOME}" /> - <property name="app.server.deploy.dir" value="${app.server.dir}/webapps" /> - <path id="project.classpath"> - <pathelement location="${env.ANT_HOME}/lib/ant.jar" /> - <fileset dir="${app.server.dir}/common/lib/ext" /> - <pathelement location="${app.server.dir}/common/lib/servlet-api.jar" /> - </path> - </target> - - <target name="deploy" depends="init"> - <java - classname="com.liferay.portal.tools.PortletDeployer" - classpathref="project.classpath" - fork="true" - newenvironment="true"> - - <!-- Required Arguments --> - - <jvmarg value="-Ddeployer.base.dir=./" /> - <jvmarg value="-Ddeployer.dest.dir=${app.server.deploy.dir}" /> - <jvmarg value="-Ddeployer.app.server.type=${app.server.type}" /> - <jvmarg value="-Ddeployer.portlet.taglib.dtd=${app.server.deploy.dir}/ext.ear/portal-web-complete.war/WEB-INF/tld/liferay-portlet.tld" /> - - <!-- Optional Arguments --> - - <jvmarg value="-Ddeployer.jboss.prefix=1" /> - <jvmarg value="-Ddeployer.tomcat.lib.dir=${app.server.dir}/common/lib/ext" /> - - <!-- Dependent Libraries --> - - <arg value="${app.server.deploy.dir}/ext.ear/portal-web-complete.war/WEB-INF/lib/util-taglib.jar" /> - <arg value="${app.server.deploy.dir}/ext.ear/lib/util-java.jar" /> - <!--<arg value="${app.server.deploy.dir}/ext.ear/lib/util-jsf.jar" />--> - </java> - </target> -</project> \ No newline at end of file |