diff --git a/build.properties b/build.properties new file mode 100644 index 0000000000..2e8534c31b --- /dev/null +++ b/build.properties @@ -0,0 +1,24 @@ +# Do NOT change the values directly in this file. If you need to change the value of a property, +# create a file called "build.local.properties" in the same folder and change the value in that file. + +# The application war file properties +app.war.version=4.2.0 +app.war.groupId=org.alfresco +app.war.packaging=war + +# Executable properties +mvn.exec=${env.MAVEN_HOME}/bin/mvn.bat +bash.exec=${env.CYGWIN_HOME}/bin/bash +catalina.exec=${app.tomcat.folder}/bin/catalina.sh + +# Maven build directory properties +mvn.build.directory=target + +# Tomcat properties +app.tomcat.folder=${mvn.build.directory}/../../../software/${app.tomcat} +app.tomcat.webapps=${app.tomcat.folder}/webapps + +# Application properties +app.folder=${app.tomcat.webapps}/${app.war.artifactId} +app.package=${app.war.artifactId}.${app.war.packaging} +app.package.path=${app.tomcat.webapps}/${app.package} \ No newline at end of file diff --git a/build.xml b/build.xml index 40dc5db6af..56cfcc5695 100644 --- a/build.xml +++ b/build.xml @@ -1,47 +1,40 @@ + + + - - - - + - - - - - - - - - - + - + - + + + - + - - - - - + + + + + @@ -54,41 +47,41 @@ - + - + - + - + - - + + - - + + - - + + diff --git a/rm-server/build.local.properties b/rm-server/build.local.properties deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/rm-server/build.properties b/rm-server/build.properties index e69de29bb2..2adce02fe7 100644 --- a/rm-server/build.properties +++ b/rm-server/build.properties @@ -0,0 +1,15 @@ +# Do NOT change the values directly in this file. If you need to change the value of a property, +# create a file called "build.local.properties" in the same folder and change the value in that file. + +# War file id for the alfresco application +app.war.artifactId=alfresco + +# Tomcat folder name used by the alfresco application +app.tomcat=tomcat + +# DB driver properties +db.driver.groupId=postgresql +db.driver.artifactId=${db.driver.groupId} +db.driver.version=9.1-901.jdbc4 +db.driver.packaging=jar +db.driver.destination=${tomcat.folder}/lib \ No newline at end of file diff --git a/rm-server/build.xml b/rm-server/build.xml index 3688b80e26..44d44f1dc3 100644 --- a/rm-server/build.xml +++ b/rm-server/build.xml @@ -1,28 +1,26 @@ - - - + - - - - + + + + - + - - - - - + + + + + - +