diff --git a/tools-ng/ecdc/eclipseConnector/aplaws-tomcat-6.0.18.launch b/tools-ng/ecdc/eclipseConnector/aplaws-tomcat-6.0.18.launch index 2e26a70a0..699acbb08 100644 --- a/tools-ng/ecdc/eclipseConnector/aplaws-tomcat-6.0.18.launch +++ b/tools-ng/ecdc/eclipseConnector/aplaws-tomcat-6.0.18.launch @@ -17,5 +17,5 @@ - + diff --git a/tools-ng/ecdc/local.ccm.properties b/tools-ng/ecdc/local.ccm.properties index 43de8d79f..026835451 100644 --- a/tools-ng/ecdc/local.ccm.properties +++ b/tools-ng/ecdc/local.ccm.properties @@ -5,6 +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 diff --git a/tools-ng/ecdc/scriptlib/build-ccm.xml b/tools-ng/ecdc/scriptlib/build-ccm.xml index 735c67bc8..cef6bdb52 100644 --- a/tools-ng/ecdc/scriptlib/build-ccm.xml +++ b/tools-ng/ecdc/scriptlib/build-ccm.xml @@ -19,14 +19,6 @@ - - @@ -79,11 +71,6 @@ - @@ -94,6 +81,7 @@ + diff --git a/tools-ng/ecdc/templates/new-app/etc/placeholder.txt b/tools-ng/ecdc/templates/new-app/etc/placeholder.txt new file mode 100644 index 000000000..7c562e789 --- /dev/null +++ b/tools-ng/ecdc/templates/new-app/etc/placeholder.txt @@ -0,0 +1,13 @@ + +Originally, this directory was meant to hold any custom fragments +a package will need to add to the system initializer file, +"enterprise.init", in a file called "enterprise.init.in". When +building a project, one of the steps to take was to run a task that +concatenates all the appropriate fragments together into one master +configuration file. + +The enterprise.init file is gone and replaced by a newer +initialization system. + +The etc/ directory might also contain custom libraries or other +special files a package relies on. diff --git a/tools-ng/ecdc/templates/new-app/lib/placeholder.txt b/tools-ng/ecdc/templates/new-app/lib/placeholder.txt new file mode 100644 index 000000000..bac9c714d --- /dev/null +++ b/tools-ng/ecdc/templates/new-app/lib/placeholder.txt @@ -0,0 +1 @@ + diff --git a/tools-ng/ecdc/templates/new-app/pdl/placeholder.txt b/tools-ng/ecdc/templates/new-app/pdl/placeholder.txt new file mode 100644 index 000000000..60927f6e5 --- /dev/null +++ b/tools-ng/ecdc/templates/new-app/pdl/placeholder.txt @@ -0,0 +1,6 @@ + +This directory contains the PDL files for custom data objects +an application creates and uses. It is organized like Java packages, +with directories following a package hierarchy. Like Java, PDL code +is organized in packages (called "models"), and PDL objects can extend +other PDL objects. diff --git a/tools-ng/ecdc/templates/new-app/sql/placeholder.txt b/tools-ng/ecdc/templates/new-app/sql/placeholder.txt new file mode 100644 index 000000000..640cfecb6 --- /dev/null +++ b/tools-ng/ecdc/templates/new-app/sql/placeholder.txt @@ -0,0 +1,10 @@ + +This directory contains the custom SQL files that create, drop, +aand upgrade the database schema for an application, and a single +custom create script ("oracle-se-create.sql", for example) for each +supported database. + +SQL files are organized by package and by the database they are +appropriate for. Note that auto generated sql, which is what most of +your sql will be, only appears in the build and deployment directories, +not in this sql/ directory! diff --git a/tools-ng/ecdc/templates/new-app/src/README.txt b/tools-ng/ecdc/templates/new-app/src/README.txt new file mode 100644 index 000000000..a52a47603 --- /dev/null +++ b/tools-ng/ecdc/templates/new-app/src/README.txt @@ -0,0 +1,2 @@ +Folds the Java source code for your package. It is organized according to the +standard Java package directory hierarchy. diff --git a/tools-ng/ecdc/templates/new-app/src/overview.html b/tools-ng/ecdc/templates/new-app/src/overview.html new file mode 100644 index 000000000..90ff0cacd --- /dev/null +++ b/tools-ng/ecdc/templates/new-app/src/overview.html @@ -0,0 +1,84 @@ + + + + + +Package: com.arsdigita.util.parameter + + + + +

+Provides for ... +

+

+ + +

+ + + + + + + + + + + + + + + + + + + + + diff --git a/tools-ng/ecdc/templates/new-app/test/README.txt b/tools-ng/ecdc/templates/new-app/test/README.txt new file mode 100644 index 000000000..dbb13d595 --- /dev/null +++ b/tools-ng/ecdc/templates/new-app/test/README.txt @@ -0,0 +1,5 @@ +This holds "Junit" and other test classes for the application. +Directory "test/" will have at least a "src/" directory underneath +it, and it may have other directories holding non-Java files +necessary for running your application tests. + diff --git a/tools-ng/ecdc/templates/new-app/web/README.txt b/tools-ng/ecdc/templates/new-app/web/README.txt new file mode 100644 index 000000000..e2509a63a --- /dev/null +++ b/tools-ng/ecdc/templates/new-app/web/README.txt @@ -0,0 +1,23 @@ +(Some information here may be outdated.) + +This holds files from your application that should be deployed directly +to the servlet container's "webapp" directory (like the document root +for a web server, the webapp root is the directory where the servlet +container looks for Java classes, and for JSPs and any static files it +needs to serve). Under "web/" you will find a "packages/" directory; +in a complete application, you might also see a "STATIC/" or +"assets/" directory for static files like graphics or CSS. + +The "packages/" directory under "web/" deserves a few special words. +"packages/" is the location for the XSL for an application, and also +for any JSPs you may want to include. Note that a ccm package is +*not* the same thing as a Java package; a CCM application can contain +many CCM packages, which can contain many Java packages. The +distinction is that a CCM package is represented by a row in a CCM +system table, can be mounted at site nodes and can have its own +dispatcher. A Java package is simply a unit of code organization, and +is not tracked by CCM in any way. + +XSL stylesheets for a package go under the "packages/package-name/xsl/" +directory. Custom JSPs go under the "packages/package-name/www/ +directory. diff --git a/tools-ng/sql/oracle-se/create_tablespace.sql b/tools-ng/sql/oracle-se/create_tablespace.sql index bb4e4405b..a1232be0d 100644 --- a/tools-ng/sql/oracle-se/create_tablespace.sql +++ b/tools-ng/sql/oracle-se/create_tablespace.sql @@ -5,10 +5,3 @@ create tablespace aplaws 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; \ No newline at end of file diff --git a/tools-ng/sql/oracle-se/create_user.sql b/tools-ng/sql/oracle-se/create_user.sql index 9c4ffd3d2..3b37d98ed 100644 --- a/tools-ng/sql/oracle-se/create_user.sql +++ b/tools-ng/sql/oracle-se/create_user.sql @@ -18,23 +18,3 @@ PROMPT Creating USER 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; diff --git a/tools-ng/webxml/lib/dom4j.jar b/tools-ng/webxml/lib/dom4j.jar new file mode 100644 index 000000000..c8c4dbb92 Binary files /dev/null and b/tools-ng/webxml/lib/dom4j.jar differ diff --git a/tools-ng/webxml/lib/jackrabbit-text-extractors.jar b/tools-ng/webxml/lib/jackrabbit-text-extractors.jar new file mode 100644 index 000000000..d3311aab6 Binary files /dev/null and b/tools-ng/webxml/lib/jackrabbit-text-extractors.jar differ diff --git a/tools-ng/webxml/lib/portal-impl-5.2.3.jar b/tools-ng/webxml/lib/portal-impl-5.2.3.jar new file mode 100644 index 000000000..6bc083e7e Binary files /dev/null and b/tools-ng/webxml/lib/portal-impl-5.2.3.jar differ diff --git a/tools-ng/webxml/lib/portal-kernel-5.2.3.jar b/tools-ng/webxml/lib/portal-kernel-5.2.3.jar new file mode 100644 index 000000000..283af6ee1 Binary files /dev/null and b/tools-ng/webxml/lib/portal-kernel-5.2.3.jar differ diff --git a/tools-ng/webxml/lib/util-java-5.2.3.jar b/tools-ng/webxml/lib/util-java-5.2.3.jar new file mode 100644 index 000000000..054bfb128 Binary files /dev/null and b/tools-ng/webxml/lib/util-java-5.2.3.jar differ