You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2009/05/13 06:25:58 UTC

svn commit: r774190 - in /portals/jetspeed-2/portal/trunk/jetspeed-installer: etc/tomcat/conf/tomcat-users.xml jetspeed-mvn-tomcat-portal-pom.xml

Author: taylor
Date: Wed May 13 04:25:55 2009
New Revision: 774190

URL: http://svn.apache.org/viewvc?rev=774190&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-998
Prefer to have the Portlet Application List's deploy features actually working from the installer. Copied in a tomcat-users.xml that matches the configured j2deployed in jetspeed.properties  
application.server.manager.name=j2deployer
application.server.manager.password=j2deployer

Modified:
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/tomcat-users.xml
    portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/tomcat-users.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/tomcat-users.xml?rev=774190&r1=774189&r2=774190&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/tomcat-users.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/tomcat/conf/tomcat-users.xml Wed May 13 04:25:55 2009
@@ -21,6 +21,9 @@
   you must define such a user - the username and password are arbitrary.
 -->
 <tomcat-users>
-  <user name="tomcat" password="tomcat" roles="tomcat" />
+  <role rolename="tomcat"/>
+  <role rolename="manager"/>
+  <role rolename="admin"/>
+  <user name="tomcat" password="tomcat" roles="tomcat" />  
   <user username="j2deployer" password="j2deployer" roles="admin,manager,tomcat"/>
 </tomcat-users>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml?rev=774190&r1=774189&r2=774190&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml Wed May 13 04:25:55 2009
@@ -182,6 +182,10 @@
                       <file>${project.build.directory}/resources/tomcat/context.xml</file>
                       <destination>context</destination>
                     </deployment>
+                    <deployment>
+                      <file>${project.build.directory}/../etc/tomcat/conf/tomcat-users.xml</file>
+                      <destination>server-conf</destination>
+                    </deployment>
                     <!-- admin pa -->
                     <deployment>
                       <artifact>org.apache.portals.jetspeed-2:j2-admin:war</artifact>
@@ -367,6 +371,10 @@
                       <file>${project.build.directory}/resources/tomcat/context.xml</file>
                       <destination>context</destination>
                     </deployment>
+                    <deployment>
+                      <file>${project.build.directory}/../etc/tomcat/conf/tomcat-users.xml</file>
+                      <destination>server-conf</destination>
+                    </deployment>                    
                     <!-- admin pa -->
                     <deployment>
                       <artifact>org.apache.portals.jetspeed-2:j2-admin:war</artifact>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org