tools-ng: integrated r1908,r1910,r1913,r1915-1919,r1926; esp.: upgrade target added. trunk hb is now in sync with vendor r1926

git-svn-id: https://svn.libreccm.org/ccm/trunk@240 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2009-08-28 13:49:40 +00:00
parent ea89531d26
commit 6b71eb3ec5
6 changed files with 311 additions and 209 deletions

View File

@ -26,6 +26,11 @@
# Set to 'modern' or 'jikes'
#build.compiler=modern
# Set to Eclipse JDT batch compiler (requires ecj.jar)
#build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
#ant.build.javac.source=1.6
#ant.build.javac.target=1.6
# These properties apply to Javac and Jikes
#compile.debug=on
#compile.optimize=on

View File

@ -5,3 +5,7 @@
## Usually you will define your own specific bundle!
#ccm.bundle.folder=${ccm.project.dir}/ccm-ldn-aplaws/bundles/devel
ccm.upgrade.package=ccm-xxx
ccm.upgrade.from.version=x.x.x
ccm.upgrade.to.version=y.y.y

View File

@ -29,25 +29,17 @@
-->
</target>
<target name="load-init" depends="prepare-load">
<target name="load-bundle-config" depends="prepare-load">
<echo>load ${applications} --init using ${ccm.bundle.folder}/cfg/integration.properties</echo>
<java classname="com.arsdigita.packaging.MasterTool"
classpathref="ccm.classpath" fork="yes">
<java classname="com.arsdigita.packaging.MasterTool" classpathref="ccm.classpath" fork="yes">
<sysproperty key="ccm.home" value="${ccm.home}" />
<!--
<sysproperty key="log4j.configuration"
value="file:runtime/${app.server.bundles.name}/conf/log4j.xml" />
<sysproperty key="java.protocol.handler.pkgs"
value="${java.protocol.handler.pkgs}" />
-->
<arg line="load ${applications} --config --parameter-file ${ccm.bundle.folder}/cfg/integration.properties" />
</java>
</target>
<target name="load" depends="prepare-load">
<echo>load ${applications} </echo>
<java classname="com.arsdigita.packaging.MasterTool"
classpathref="ccm.classpath" fork="yes">
<java classname="com.arsdigita.packaging.MasterTool" classpathref="ccm.classpath" fork="yes">
<sysproperty key="ccm.home" value="${ccm.home}" />
<!--
<sysproperty key="log4j.configuration"
@ -87,4 +79,51 @@
</path>
</target>
<target name="upgrade" description="Upgrade">
<fail message="Configure the package being upgraded using the ccm.upgrade.package property">
<condition>
<or>
<not>
<isset property="ccm.upgrade.package" />
</not>
<equals arg1="ccm-xxx" arg2="${ccm.upgrade.package}" />
</or>
</condition>
</fail>
<fail message="Configure the source version using the ccm.upgrade.from.version property">
<condition>
<or>
<not>
<isset property="ccm.upgrade.from.version" />
</not>
<equals arg1="xxx" arg2="${ccm.upgrade.from.version}" />
<not>
<matches pattern="[0-9]+\.[0-9]+\.[0-9]+" string="${ccm.upgrade.from.version}" />
</not>
</or>
</condition>
</fail>
<fail message="Configure the target version using the ccm.upgrade.to.version property">
<condition>
<or>
<not>
<isset property="ccm.upgrade.to.version" />
</not>
<equals arg1="xxx" arg2="${ccm.upgrade.to.version}" />
<not>
<matches pattern="[0-9]+\.[0-9]+\.[0-9]+" string="${ccm.upgrade.to.version}" />
</not>
</or>
</condition>
</fail>
<echo message="Upgrading ${ccm.upgrade.package} from version ${ccm.upgrade.from.version} to ${ccm.upgrade.to.version}" />
<java classname="com.arsdigita.packaging.MasterTool" fork="yes">
<classpath refid="ccm.classpath" />
<sysproperty key="ccm.home" value="${ccm.home}" />
<arg line="upgrade ${ccm.upgrade.package} --from-version=${ccm.upgrade.from.version} --to-version=${ccm.upgrade.to.version}" />
</java>
</target>
</project>

View File

@ -0,0 +1,14 @@
create tablespace aplaws
logging
datafile 'aplaws.dbf'
size 32m
autoextend on
next 32m maxsize 2048m
extent management local;
create tablespace aplaws
logging
datafile 'aplaws.dbf'
size 32m
autoextend on
next 32m maxsize 2048m
extent management local;

View File

@ -0,0 +1,40 @@
PROMPT Dropping USER ccm
DROP USER ccm CASCADE;
PROMPT Creating USER ccm
CREATE USER ccm
IDENTIFIED BY ccm
DEFAULT TABLESPACE APLAWS
TEMPORARY TABLESPACE TEMP PROFILE DEFAULT
QUOTA UNLIMITED ON APLAWS
QUOTA 0 ON USERS;
GRANT CONNECT, RESOURCE, QUERY REWRITE, CTXAPP, CREATE PROCEDURE, CREATE TRIGGER, CREATE TABLE, CREATE VIEW, CREATE SEQUENCE TO ccm;
REVOKE UNLIMITED TABLESPACE FROM ccm;
REVOKE RESOURCE FROM ccm;
QUIT;
PROMPT Dropping USER ccm
DROP USER ccm CASCADE;
PROMPT Creating USER ccm
CREATE USER ccm
IDENTIFIED BY ccm
DEFAULT TABLESPACE APLAWS
TEMPORARY TABLESPACE TEMP PROFILE DEFAULT
QUOTA UNLIMITED ON APLAWS
QUOTA 0 ON USERS;
GRANT CONNECT, RESOURCE, QUERY REWRITE, CTXAPP, CREATE PROCEDURE, CREATE TRIGGER, CREATE TABLE, CREATE VIEW, CREATE SEQUENCE TO ccm;
REVOKE UNLIMITED TABLESPACE FROM ccm;
REVOKE RESOURCE FROM ccm;
QUIT;