Permalink
Browse files

OZP-492 Fixed Metrics build process

  • Loading branch information...
1 parent b4938bf commit 5370067cc35ac9c5a565f1fc3cf3ac670b488e3c @tdehart tdehart committed Mar 5, 2013
View
@@ -16,13 +16,13 @@ app.org=ozone
app.servlet.version=2.4
app.version=7.0.0-GA
cas.server.module=cas-server-owf
-cas.server.org=ozone-widgeting-framework
+cas.server.org=ozone-widgeting-framework-legacy
cas.server.rev=3.3.2.2
owf.build.module=build-base
owf.build.org=owf
owf.build.rev=2.6
owf.security.module=owf-security
-owf.security.org=ozone-widgeting-framework
+owf.security.org=ozone-widgeting-framework-legacy
owf.security.rev=3.14
plugins.build-test-data=1.1.0
plugins.code-coverage=1.2
@@ -34,6 +34,6 @@ plugins.tomcat=1.3.7
plugins.ui-performance=1.2.2
plugins.webdriver=0.3.3
tomcat.custom.module=tomcat-owf-custom
-tomcat.custom.org=owf
-tomcat.custom.rev=1.0.4
+tomcat.custom.org=ozone-widgeting-framework-legacy
+tomcat.custom.rev=1.0.6
prefs.dataSource.url="jdbc:hsqldb:file:metricsDb;shutdown=true"
View

Large diffs are not rendered by default.

Oops, something went wrong.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
@@ -1,14 +1,14 @@
<project xmlns:ivy="antlib:org.apache.ivy.ant" name="owf-server" default="bundle" basedir=".">
<property file="${basedir}/application.properties" />
- <import file="${owf.build.module}-${owf.build.rev}/server-base.xml" optional="true"/>
+ <import file="build-base.xml" optional="true"/>
<property name="lib.dir" value="${basedir}/lib" />
<property name="work.dir" value="${basedir}/work" />
<property name="jstoolkit.dir" value="${work.dir}/jsdoc/jsdoc_toolkit-2.3.2/jsdoc-toolkit" />
<property name="staging.dir" value="staging" />
<property name="tomcat.dir" value="${staging.dir}/apache-tomcat-${tomcat.ver}" />
- <property name="build.base.dir" value="${owf.build.module}-${owf.build.rev}" />
+ <property name="build.base.dir" value="${basedir}" />
<condition property="offline.arg" value="-DOFFLINE_REPO=${offline_repo}" else="" >
<isset property="offline_repo" />
@@ -24,13 +24,8 @@
<os family="windows" />
</condition>
- <available file="${owf.build.module}-${owf.build.rev}/build-base.xml" property="build-base.available" />
+ <!--available file="${owf.build.module}-${owf.build.rev}/build-base.xml" property="build-base.available" /-->
<target name="init-build" unless="build-base.available" >
- <mkdir dir="${owf.build.module}-${owf.build.rev}" />
- <get src="https://www.owfgoss.org/svn/repos/ozone/ivy-repo/no-namespace/${owf.build.org}/${owf.build.module}/zips/${owf.build.module}-${owf.build.rev}.zip"
- dest="${owf.build.module}-${owf.build.rev}/${owf.build.module}-${owf.build.rev}.zip"
- username="owf-build" password="0wf-bu1!d" />
- <unzip src="${owf.build.module}-${owf.build.rev}/${owf.build.module}-${owf.build.rev}.zip" dest="${owf.build.module}-${owf.build.rev}" />
<ant dir="." target="init-ivy" inheritall="false" />
</target>
<!-- =================================
@@ -324,10 +319,18 @@
<copy file="${basedir}/license.txt" tofile="${staging.dir}/license.txt"/>
</target>
- <target name="post-bundle-cleanup" >
+ <target name="post-bundle-cleanup" >
<delete file="${staging.dir}/cas-server-extras-${cas.server.rev}.zip" />
+ <delete file="${staging.dir}/cas-server-owf-${cas.server.rev}.war" />
<delete file="${staging.dir}/owf-security-extras-${owf.security.rev}.zip" />
<delete file="${staging.dir}/owf-security-project-${owf.security.rev}.zip" />
+ <delete file="${staging.dir}/owf-security-${owf.security.rev}.jar" />
+ <delete>
+ <fileset dir="${staging.dir}" includes="*.zip"/>
+ </delete>
+ <delete>
+ <fileset dir="${staging.dir}" includes="*.jar"/>
+ </delete>
</target>
<target name="release" depends="_init-ivy,bundle">
@@ -0,0 +1,23 @@
+casSettings.serverBase=https://localhost:8443/
+casSettings.serverWebappName=cas
+casSettings.serverLoginLocation=login
+casSettings.serverLogoutLocation=logout
+casSettings.ozoneClientBase=https://localhost:8443/
+casSettings.prefsClientBase=https://localhost:8443/
+casSettings.ozoneWebappName=owf
+casSettings.prefsWebappName=admin
+casSettings.marketplaceClientBase=https://localhost:8443/
+casSettings.marketplaceWebappName=marketplace
+casSettings.fullLoginURL=https://localhost:8443/cas/login
+casSettings.fullServiceURL=https://localhost:8443/cas
+jetty.SecurePort=8443
+ozoneclient.PrefsUrl=https://localhost:8443/owf/prefs
+prefs.dataSource.dbCreate="update"
+prefs.dataSource.username="sa"
+prefs.dataSource.password=""
+prefs.dataSource.driverClassName="org.hsqldb.jdbcDriver"
+prefs.dataSource.url="jdbc:hsqldb:file:prodDb;shutdown=true"
+prefs.systemProperty.cas.server.location='localhost'
+prefs.systemProperty.cas.server.port='8443'
+prefs.securitysettings.serviceProperties.service='https://localhost:8443/admin/j_spring_cas_security_check'
+prefs.securitysettings.ticketValidator.proxyCallbackUrl='https://localhost:8443/admin/secure/receptor'
View
30 ivy.xml
@@ -1,41 +1,49 @@
<ivy-module version="2.0">
<info organisation="${app.org}" module="${app.name}" revision="${app.version}"/>
- <configurations defaultconfmapping="jsdoc->default;compressjs->default;owf.samples->*">
+
+ <configurations >
<conf name="build" />
<conf name="compressjs" />
<conf name="jsdoc" />
<conf name="zip" />
<conf name="bundle" />
- <!--<conf name="jetty" />-->
+ <!--conf name="jetty" /-->
<conf name="tomcat" />
<conf name="release" />
<conf name="cas.server" />
</configurations>
<publications>
- <artifact name="${app.name}-bundle" conf="release" type="zip"
+ <artifact name="${app.name}-bundle" type="zip"
ext="zip" />
</publications>
<dependencies>
<!--<dependency org="${jetty.custom.org}" name="${jetty.custom.module}" rev="${jetty.custom.rev}" conf="jetty->zip" transitive="false" >-->
<!--<artifact name="${jetty.custom.module}" type="zip" />-->
<!--</dependency>-->
- <dependency org="${tomcat.custom.org}" name="${tomcat.custom.module}" rev="${tomcat.custom.rev}" conf="tomcat->zip" transitive="false" >
+ <dependency org="${tomcat.custom.org}" name="${tomcat.custom.module}" rev="${tomcat.custom.rev}" transitive="false" >
<artifact name="${tomcat.custom.module}" type="zip" />
</dependency>
- <dependency org="${cas.server.org}" name="${cas.server.module}" rev="${cas.server.rev}" conf="cas.server->release,zip" changing="true" transitive="false" />
- <dependency org="${owf.security.org}" name="${owf.security.module}" rev="${owf.security.rev}" conf="bundle->zip" changing="true" transitive="false" />
+ <dependency org="${cas.server.org}" name="${cas.server.module}" rev="${cas.server.rev}" changing="true" transitive="false" >
+ <artifact type="zip" name="cas-server-extras"/>
+ <artifact type="war" name="cas-server-owf"/>
+ </dependency>
+ <dependency org="${owf.security.org}" name="${owf.security.module}" rev="${owf.security.rev}" changing="true" transitive="false" >
+ <artifact type="zip" name="owf-security-project"/>
+ <artifact type="zip" name="owf-security-extras"/>
+ <artifact type="jar" name="owf-security"/>
+ </dependency>
- <dependency org="owf.util" name="OWFAntTasks" rev="1.0.0" conf="compressjs" />
- <dependency org="net.alchim31.3rd.com.yahoo.platform.yui" name="yuicompressor" rev="2.4.2" conf="compressjs" />
+ <dependency org="ozone-widgeting-framework-legacy" name="OWFAntTasks" rev="1.0.0" />
+ <dependency org="net.alchim31.3rd.com.yahoo.platform.yui" name="yuicompressor" rev="2.4.2" />
- <dependency org="org.jsdoctoolkit" name="jsdoc-dist" rev="2.3.2" conf="jsdoc">
+ <dependency org="org.jsdoctoolkit" name="jsdoc-dist" rev="2.3.2" >
<artifact type="zip" name="jsdoc-dist"/>
</dependency>
- <dependency org="org.jsdoctoolkit" name="jsdoctoolkit-ant-task" rev="1.0" conf="jsdoc" >
+ <dependency org="org.jsdoctoolkit" name="jsdoctoolkit-ant-task" rev="1.0" >
<exclude module="ant-contrib"/>
<exclude module="jsdoc" />
</dependency>
</dependencies>
-</ivy-module>
+</ivy-module>
View
@@ -0,0 +1,35 @@
+<ivysettings>
+ <!--<properties file="ivy.properties" />-->
+ <properties environment="env" />
+ <settings defaultResolver="chain"/>
+ <property name="nexus-public"
+ value="https://www.owfgoss.org/nexus/content/groups/public"/>
+
+ <property name="ivy.local.default.root" value="${ivy.default.ivy.user.dir}/local"
+ override="false" />
+ <property name="ivy.local.release.root" value="${ivy.default.ivy.user.dir}/release/no-namespace/"
+ override="false" />
+ <property name="ivy.local.default.ivy.pattern"
+ value="[organisation]/[module]/[revision]/[type]s/[artifact]-[revision].[ext]"
+ override="false" />
+ <property name="ivy.local.default.artifact.pattern"
+ value="[organisation]/[module]/[revision]/[type]s/[artifact]-[revision].[ext]"
+ override="false" />
+ <property name="ibiblio-maven2-root" value="http://repo1.maven.org/maven2/" override="false" /><!-- FOR REMOTE IVY:INSTALLS INTO REPO -->
+ <namespaces>
+ <namespace name="maven2"></namespace>
+ </namespaces>
+ <cache resolutionDir="resolution" repositoryDir="repository" />
+ <resolvers>
+
+ <chain name="chain" checkmodified="true">
+ <filesystem name="local" alwaysCheckExactRevision="true" >
+ <ivy pattern="${ivy.local.default.root}/[organisation]/[module]/ivy-[revision].xml" />
+ <artifact pattern="${ivy.local.default.root}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]" />
+ </filesystem>
+ <ibiblio name="nexus" m2compatible="true" root="${nexus-public}"/>
+ <ibiblio name="maven2-library-repo" root="${ibiblio-maven2-root}" m2compatible="true" namespace="maven2"/>
+ </chain>
+
+ </resolvers>
+</ivysettings>
View
@@ -0,0 +1,29 @@
+<ivysettings>
+ <typedef name="svn" classname="fm.last.ivy.plugins.svnresolver.SvnResolver" />
+ <properties file="ivy.properties" />
+ <settings defaultResolver="chain" />
+ <property name="ivy.local.default.root" value="${ivy.default.ivy.user.dir}/local"
+ override="false" />
+ <property name="ivy.local.default.ivy.pattern"
+ value="[organisation]/[module]/[revision]/[type]s/[artifact]-[revision].[ext]"
+ override="false" />
+ <property name="ivy.local.default.artifact.pattern"
+ value="[organisation]/[module]/[revision]/[type]s/[artifact]-[revision].[ext]"
+ override="false" />
+ <latest-strategies>
+ <latest-time name="newest-strategy" />
+ </latest-strategies>
+ <resolvers>
+ <chain name="chain" checkmodified="true" >
+ <filesystem name="local" alwaysCheckExactRevision="true" >
+ <ivy pattern="${ivy.local.default.root}/[organisation]/[module]/ivy-[revision].xml" />
+ <artifact
+ pattern="${ivy.local.default.root}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]" />
+ </filesystem>
+ <filesystem name="offline" checkmodified="true">
+ <ivy pattern="${offline_repo}/[organisation]/[module]/ivys/ivy-[revision].xml" />
+ <artifact pattern="${offline_repo}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]" />
+ </filesystem>
+ </chain>
+ </resolvers>
+</ivysettings>

0 comments on commit 5370067

Please sign in to comment.