Skip to content

Commit

Permalink
Merge branch 'master' into small-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelwechner committed Aug 9, 2012
2 parents 6d88ff8 + de8c3f7 commit 8238e29
Show file tree
Hide file tree
Showing 560 changed files with 38 additions and 32 deletions.
55 changes: 28 additions & 27 deletions conf/resource-types.xml
Expand Up @@ -10,9 +10,10 @@

<!-- NOTE: Do not use relative paths to reference resource types, because the paths are not being resolved re the location of (local.)resource-types.xml -->

<resource-types xmlns="http://www.wyona.org/yanel/1.0" version="2012071600">
<resource-types xmlns="http://www.wyona.org/yanel/1.0" version="2012072700">

<changes>
<change version="2012072700">consolidate resources into same directory</change>
<change version="2012071600">scheduler jobs overview added</change>
<change version="2012011800">generic user registration added</change>
<change version="2011081600">jelly controller adapter added in order to support CUD version 3 (see contributions/resources/creatable-modifiable-deletable-v3)</change>
Expand Down Expand Up @@ -46,23 +47,23 @@
<resource-type package="org.wyona.yanel.impl.resources.jellyadapterofcmdv3"/> <!-- INFO: This resource is loaded as dependency via src/build/dependencies.xml -->
<resource-type src="@YANEL_SRC_DIR@/src/resources/scheduler/" compile="true"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/registration/" compile="true"/>
<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/personalized-content/" compile="true"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/personalized-content/" compile="true"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/workflow-dashboard/" compile="true"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/comment/" compile="true"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/pageMetaDataManager/" compile="true"/>
<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/security-api/" compile="true"/>
<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/search/" compile="true"/>
<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/nutch/" compile="true" copy-dir-name="yanel-nutch"/>
<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/lookup/" compile="true" copy-dir-name="yanel-lookup"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/security-api/" compile="true"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/search/" compile="true"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/nutch/" compile="true" copy-dir-name="yanel-nutch"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/lookup/" compile="true" copy-dir-name="yanel-lookup"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/tinymce/" compile="true" copy-dir-name="yanel-tinymce"/>
<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/image/" compile="true"/>
<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/xinha/" compile="true" copy-dir-name="yanel-xinha"/>
<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/sessionmanager/" compile="true" copy-dir-name="yanel-sessionmanager"/>
<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/404/" compile="true"/>
<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/generic-exception-handler/" compile="true"/>
<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/policymanager/" compile="true" copy-dir-name="yanel-policymanager"/>
<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/timeline/" compile="true" copy-dir-name="yanel-timeline"/>
<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/data-repo-sitetree/" compile="true" copy-dir-name="yanel-data-repo-sitetree"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/image/" compile="true"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/xinha/" compile="true" copy-dir-name="yanel-xinha"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/sessionmanager/" compile="true" copy-dir-name="yanel-sessionmanager"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/404/" compile="true"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/generic-exception-handler/" compile="true"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/policymanager/" compile="true" copy-dir-name="yanel-policymanager"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/timeline/" compile="true" copy-dir-name="yanel-timeline"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/data-repo-sitetree/" compile="true" copy-dir-name="yanel-data-repo-sitetree"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/navigation/" compile="true" copy-dir-name="yanel-navigation"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/translation/" compile="true" copy-dir-name="yanel-translation"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/file/" compile="true"/>
Expand All @@ -76,26 +77,26 @@
<resource-type src="@YANEL_SRC_DIR@/src/resources/user-mgmt/" compile="true" copy-dir-name="yanel-user-mgmt"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/testing-control/" compile="true" copy-dir-name="yanel-testing-control"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/testing-times/" compile="true" copy-dir-name="yanel-testing-times"/>
<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/atom/" compile="true" copy-dir-name="yanel-atom"/>
<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/atom-entry/" compile="true" copy-dir-name="yanel-atom-entry"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/atom/" compile="true" copy-dir-name="yanel-atom"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/atom-entry/" compile="true" copy-dir-name="yanel-atom-entry"/>

<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/contact-form/" compile="true" copy-dir-name="yanel-contact-form"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/contact-form/" compile="true" copy-dir-name="yanel-contact-form"/>
<!-- IMPORTANT: Please note that forgotpw depends on contact-form and hence the build order matters! -->
<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/forgotpw/" compile="true"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/forgotpw/" compile="true"/>

<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/wiki/" compile="true" copy-dir-name="yanel-wiki"/>
<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/zip/" compile="true" copy-dir-name="yanel-zip"/>
<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/calendar/" compile="true" copy-dir-name="yanel-calendar"/>
<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/resource-creator/" compile="true"/>
<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/davcollection/" compile="true" copy-dir-name="yanel-davcollection"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/wiki/" compile="true" copy-dir-name="yanel-wiki"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/zip/" compile="true" copy-dir-name="yanel-zip"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/calendar/" compile="true" copy-dir-name="yanel-calendar"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/resource-creator/" compile="true"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/davcollection/" compile="true" copy-dir-name="yanel-davcollection"/>

<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/pdf/" compile="true" copy-dir-name="yanel-pdf"/>
<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/yanel-user/" compile="true" copy-dir-name="yanel-yanel-user"/>
<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/redirect/" compile="true"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/pdf/" compile="true" copy-dir-name="yanel-pdf"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/yanel-user/" compile="true" copy-dir-name="yanel-yanel-user"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/redirect/" compile="true"/>

<!-- Google Web Toolkit sandbox resource type -->
<!--
<resource-type src="@YANEL_SRC_DIR@/src/contributions/resources/GWT-sandbox/" compile="true"/>
<resource-type src="@YANEL_SRC_DIR@/src/resources/GWT-sandbox/" compile="true"/>
-->

<!-- INFO: Third party resource types (TODO: Add to Hudson)
Expand Down
2 changes: 1 addition & 1 deletion src/build/resource-types/resource-type.build.xml
Expand Up @@ -8,7 +8,7 @@

<!--
The default task config attribute (for example default="compile") seems not to be imported at least with Ant 1.6.5 or Ant 1.7.1
which means it needs to be set within each resource build.xml (see for example src/contributions/resources/forgotpw/build.xml)
which means it needs to be set within each resource build.xml (see for example src/resources/forgotpw/build.xml)
-->

<dirname property="resource.home.dir" file="${ant.file}"/>
Expand Down
2 changes: 1 addition & 1 deletion src/build/targets/build-binary-snapshot.xml
Expand Up @@ -138,7 +138,7 @@
<replacetoken>../src/resources</replacetoken>
</replace>
<replace file="${tmp.dir}/WEB-INF/classes/yanel.properties" value="../../resources">
<replacetoken>../src/contributions/resources</replacetoken>
<replacetoken>../src/resources</replacetoken>
</replace>
<replace file="${tmp.dir}/WEB-INF/classes/yanel.properties" value="../../resources">
<replacetoken>../src/realms/welcome-admin/yanel/resources</replacetoken>
Expand Down
4 changes: 2 additions & 2 deletions src/build/targets/build-update-war.xml
Expand Up @@ -30,7 +30,7 @@
<fileset dir="${yanel.source.home}/src/resources"/>
</copy>
<copy todir="${update.dir}/${servlet.context.prefix}/resources">
<fileset dir="${yanel.source.home}/src/contributions/resources"/>
<fileset dir="${yanel.source.home}/src/resources"/>
</copy>
<copy todir="${update.dir}/${servlet.context.prefix}/resources">
<fileset dir="${yanel.source.home}/src/realms/welcome-admin/yanel/resources"/>
Expand All @@ -42,7 +42,7 @@
<replacetoken>../src/resources</replacetoken>
</replace>
<replace file="${update.dir}/${servlet.context.prefix}/WEB-INF/classes/yanel.properties" value="../../resources">
<replacetoken>../src/contributions/resources</replacetoken>
<replacetoken>../src/resources</replacetoken>
</replace>
<replace file="${update.dir}/${servlet.context.prefix}/WEB-INF/classes/yanel.properties" value="../../resources">
<replacetoken>../src/realms/welcome-admin/yanel/resources</replacetoken>
Expand Down
2 changes: 1 addition & 1 deletion src/build/targets/create-new-resource-type.xml
Expand Up @@ -4,7 +4,7 @@
<taskdef resource="net/sf/antcontrib/antlib.xml"/>
<description>Create new resource-type</description>

<property name="new-resource-types.home" location="${yanel.source.home}/src/contributions/resources"/>
<property name="new-resource-types.home" location="${yanel.source.home}/src/resources"/>

<target name="new-resource-type" description="Create a new resource-type" depends="init">
<echo>Create new resource-type from scratch ${yanel.source.home}/src/build/targets/create-new-resource-type/from-scratch-resource-template</echo>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 8238e29

Please sign in to comment.