You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by br...@apache.org on 2004/04/12 22:01:22 UTC
svn commit: rev 9976 - in xml/forrest/trunk/scratchpad/forrestbot2: . core webapp/src/conf
Author: brondsem
Date: Mon Apr 12 13:01:21 2004
New Revision: 9976
Modified:
xml/forrest/trunk/scratchpad/forrestbot2/core/deploy.xml
xml/forrest/trunk/scratchpad/forrestbot2/webapp/src/conf/groups.xml
xml/forrest/trunk/scratchpad/forrestbot2/webapp/src/conf/osuser.xml
xml/forrest/trunk/scratchpad/forrestbot2/webapp/src/conf/projects.xml
xml/forrest/trunk/scratchpad/forrestbot2/webapp/src/conf/settings.properties
xml/forrest/trunk/scratchpad/forrestbot2/xml-forrest.xml
Log:
beginnings of deploy.cvs workstage
Modified: xml/forrest/trunk/scratchpad/forrestbot2/core/deploy.xml
==============================================================================
--- xml/forrest/trunk/scratchpad/forrestbot2/core/deploy.xml (original)
+++ xml/forrest/trunk/scratchpad/forrestbot2/core/deploy.xml Mon Apr 12 13:01:21 2004
@@ -28,5 +28,36 @@
<!-- set a property to be used in the notify target -->
<property name="notify.deploy-location" value="${deploy.local.dir}"/>
</target>
+
+ <property name="deploy.cvs.user" value="anoncvs"/>
+ <property name="deploy.cvs.password" value="anoncvs"/>
+ <property name="deploy.cvs.root" value="/home/cvs"/>
+ <property name="deploy.cvs.host" value="cvs.apache.org"/>
+ <property name="deploy.cvs.module" value="${ant.project.name}"/>
+
+ <property name="deploy.cvsmodule-dir" value="work/cvsmodules-deploy/${ant.project.name}"/>
+
+ <target name="deploy.cvs">
+ <property name="deploy.cvs.fullroot" value=":ext:${deploy.cvs.user}@${deploy.cvs.host}:${deploy.cvs.root}"/>
+ <!-- log in -->
+ <cvspass cvsroot="${deploy.cvs.fullroot}" password="${deploy.cvs.password}"/>
+ <!-- get current CVS source -->
+ <cvs cvsRoot="${deploy.cvs.fullroot}"
+ package="${deploy.cvs.module}"
+ dest="${deploy.cvsmodule-dir}"
+ command="checkout"
+ failonerror="true"
+ />
+ <!-- copy new files into sandbox -->
+ <copy todir="${deploy.cvsmodule-dir}">
+ <fileset dir="${build.site-dir}"/>
+ </copy>
+ <!-- check in to CVS -->
+ <cvs command="commit" cvsRoot="${deploy.cvs.fullroot}"
+ dest="${build.site-dir}"
+ failonerror="true"
+ noexec="true"
+ />
+ </target>
</project>
Modified: xml/forrest/trunk/scratchpad/forrestbot2/webapp/src/conf/groups.xml
==============================================================================
--- xml/forrest/trunk/scratchpad/forrestbot2/webapp/src/conf/groups.xml (original)
+++ xml/forrest/trunk/scratchpad/forrestbot2/webapp/src/conf/groups.xml Mon Apr 12 13:01:21 2004
@@ -1,3 +1,56 @@
+<<<<<<< .mine
+<?xml version="1.0"?>
+
+<!-- used by OSUser -->
+
+<!-- these projects need to be kept in sync with the list in projects.xml -->
+<groups>
+ <group id="BE Web">
+ <!-- projects -->
+ <user id="siteController"/>
+ <user id="portal"/>
+ <user id="fiscalCalendarComp"/>
+ <!-- users -->
+ <user id="ekr9y"/><!-- dave brondsema -->
+ <user id="e5843"/><!-- kyle adams -->
+ </group>
+ <group id="CRM Application Support">
+ <!-- projects -->
+ <user id="employeeAward"/>
+ <!-- users -->
+ <user id="ekr9y"/><!-- dave brondsema -->
+ <user id="e5843"/><!-- kyle adams -->
+ </group>
+ <group id="SCM Support">
+ <!-- projects -->
+ <user id="priceMaintResources"/>
+ <!-- users -->
+ <user id="ekr9y"/><!-- dave brondsema -->
+ <user id="e5843"/><!-- kyle adams -->
+ </group>
+ <group id="uncategorized">
+ <user id="companyComponent"/>
+ <user id="compensationCommon"/>
+ <user id="cost1Comp"/>
+ <user id="dcrComponent"/>
+ <user id="driverCompComponent"/>
+ <user id="employeeAward"/>
+ <user id="fiscalCalendarComp"/>
+ <user id="integrationToolkitDocumentation"/>
+ <user id="loadBuilding"/>
+ <user id="organizationComp"/>
+ <user id="portal"/>
+ <user id="priceMaintCommon"/>
+ <user id="priceMaintResources"/>
+ <user id="salesCompComponent"/>
+ <user id="salesOrgMaintComp"/>
+ <user id="siteController"/>
+ <user id="userManagementBatch"/>
+ <user id="userManagementComp"/>
+ <user id="wmsCompanyComponent"/>
+ <user id="wmsVendorComponent"/>
+ </group>
+=======
<?xml version="1.0"?>
<!--
Copyright 2002-2004 The Apache Software Foundation
@@ -32,4 +85,5 @@
<!-- users -->
<user id="forrest-dev"/>
</group>
+>>>>>>> .r9590
</groups>
Modified: xml/forrest/trunk/scratchpad/forrestbot2/webapp/src/conf/osuser.xml
==============================================================================
--- xml/forrest/trunk/scratchpad/forrestbot2/webapp/src/conf/osuser.xml (original)
+++ xml/forrest/trunk/scratchpad/forrestbot2/webapp/src/conf/osuser.xml Mon Apr 12 13:01:21 2004
@@ -1,3 +1,24 @@
+<<<<<<< .mine
+<?xml version="1.0"?>
+<opensymphony-user>
+ <provider class="com.opensymphony.user.provider.weblogic.WeblogicCredentialsProvider">
+ <property name="username">forrestBotUser</property>
+ <property name="password">forrestBotPW</property>
+ <property name="serverurl">t3://localhost:80</property>
+ <property name="maxrecords">1000</property>
+ </provider>
+ <provider class="com.opensymphony.user.provider.file.XMLCredentialsProvider">
+ <property name="storeFile">projects.xml</property>
+ <property name="storeFileType">resource</property>
+ </provider>
+
+ <provider class="com.opensymphony.user.provider.file.XMLAccessProvider">
+ <property name="storeFile">groups.xml</property>
+ <property name="storeFileType">resource</property>
+ </provider>
+
+ <provider class="com.opensymphony.user.provider.memory.MemoryProfileProvider" />
+=======
<?xml version="1.0"?>
<!--
Copyright 2002-2004 The Apache Software Foundation
@@ -34,4 +55,5 @@
</provider>
<provider class="com.opensymphony.user.provider.memory.MemoryProfileProvider" />
+>>>>>>> .r9590
</opensymphony-user>
Modified: xml/forrest/trunk/scratchpad/forrestbot2/webapp/src/conf/projects.xml
==============================================================================
--- xml/forrest/trunk/scratchpad/forrestbot2/webapp/src/conf/projects.xml (original)
+++ xml/forrest/trunk/scratchpad/forrestbot2/webapp/src/conf/projects.xml Mon Apr 12 13:01:21 2004
@@ -1,3 +1,29 @@
+<<<<<<< .mine
+<?xml version="1.0"?>
+
+<!-- this list needs to be kept in sync with the projects used in groups.xml -->
+<users>
+ <user id="companyComponent"/>
+ <user id="compensationCommon"/>
+ <user id="cost1Comp"/>
+ <user id="dcrComponent"/>
+ <user id="driverCompComponent"/>
+ <user id="employeeAward"/>
+ <user id="fiscalCalendarComp"/>
+ <user id="integrationToolkitDocumentation"/>
+ <user id="loadBuilding"/>
+ <user id="organizationComp"/>
+ <user id="portal"/>
+ <user id="priceMaintCommon"/>
+ <user id="priceMaintResources"/>
+ <user id="salesCompComponent"/>
+ <user id="salesOrgMaintComp"/>
+ <user id="siteController"/>
+ <user id="userManagementBatch"/>
+ <user id="userManagementComp"/>
+ <user id="wmsCompanyComponent"/>
+ <user id="wmsVendorComponent"/>
+=======
<?xml version="1.0"?>
<!--
Copyright 2002-2004 The Apache Software Foundation
@@ -27,4 +53,5 @@
<user id="avalon-phoenix"/>
<user id="krysalis-centipede"/>
<user id="ws-site"/>
+>>>>>>> .r9590
</users>
Modified: xml/forrest/trunk/scratchpad/forrestbot2/webapp/src/conf/settings.properties
==============================================================================
--- xml/forrest/trunk/scratchpad/forrestbot2/webapp/src/conf/settings.properties (original)
+++ xml/forrest/trunk/scratchpad/forrestbot2/webapp/src/conf/settings.properties Mon Apr 12 13:01:21 2004
@@ -1,26 +1,14 @@
-# Copyright 2002-2004 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
# settings.properties is used to configure the webapp to look
# in certain locations for files and directories
#
-# all of the following should be absolute
+# all of the following must be absolute
#
# forrest executable
#forrest-exec=/path/to/xml-forrest/bin/forrest
#forrest-exec=d:/path/to/xml-forrest/bin/forrest.bat
#
+# this file is created by the webapp and used by the 'overseer' script
+#commands-file=/path/to/somewhere/commands
# directory that contains the forrestbot definition files for each site
#config-dir=/path/to/somewhere/conf
#
@@ -29,27 +17,28 @@
#logs-dir=/path/to/somewhere/logs
#
# URLs (for HTML links)
-#build-url=http://somedomain/path/to/builds
-#
+#build-url=build
+#logs-url=logs
+
+forrest-exec=d:/sandbox/xml-forrest/build/dist/shbat/bin/forrest.bat
+
# this will debug ALL output from the 'build' and 'deploy' processes that are started
-#debug-exec=false
-#
-# seconds to wait before refreshing log viewing page
-#refreshrate=60
-#
-# customize what targets to run (e.g. "build notify.special")
-#targets.build=build
-#targets.deploy=deploy
+debug-exec=false
-forrest-exec=c:/path/to/forrest/bin/forrest.bat
+#commands-file=/home/dpb2/forrest/xml-forrest/scratchpad/forrestbot2/commands
+#config-dir=/home/dpb2/forrest/xml-forrest/scratchpad/forrestbot2
+config-dir=d:/sandbox/javadev/forrestbot2
-config-dir=c:/path/to/forrestbot/projects
-logs-dir=c:/some/path/to/build/logs
-build-dir=c:/some/path/to/build/sites
-build-url=http://127.0.0.1/myprojects
+build-dir=d:/sandbox/javadev/forrest/build/site/projects-build
+logs-dir=d:/sandbox/javadev/forrest/build/site/projects-logs
+#build-url=/projects-build
+#logs-url=/projects-logs
+build-url=file:///d:/sandbox/javadev/forrest/build/site/projects-build
+logs-url=file:///d:/sandbox/javadev/forrest/build/site/projects-logs
-debug-exec=false
+# seconds
refreshrate=60
+# customize what targets to run (e.g. "build notify.special")
targets.build=build
targets.deploy=deploy
Modified: xml/forrest/trunk/scratchpad/forrestbot2/xml-forrest.xml
==============================================================================
--- xml/forrest/trunk/scratchpad/forrestbot2/xml-forrest.xml (original)
+++ xml/forrest/trunk/scratchpad/forrestbot2/xml-forrest.xml Mon Apr 12 13:01:21 2004
@@ -18,6 +18,10 @@
<property name="getsrc.svn.url" value="http://svn.apache.org/repos/asf/xml/forrest/trunk"/>
<target name="getsrc" depends="getsrc.svn"/>
+
+ <import file="deploy.cvs.settings.xml"/>
+ <property name="deploy.cvs.module" value="xml-site/targets/forrest"/>
+ <target name="deploy" depends="deploy.cvs"/>
<import file="core/forrestbot.xml"/>
</project>