[Yanel-commits] rev 47049 - in public/yanel/trunk/src: build/resource-types contributions/resources/policymanager/htdocs contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager

[guillaume at wyona.com]

Author: guillaume
Date: 2010-01-14 11:33:34 +0100 (Thu, 14 Jan 2010)
New Revision: 47049

Removed:
   public/yanel/trunk/src/contributions/resources/policymanager/htdocs/js/
Modified:
   public/yanel/trunk/src/build/resource-types/GWT-RT.build.xml
   public/yanel/trunk/src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyManagerResource.java
Log:
Now using the GWT module compiled at resource-type build time for the policy manager,
 and not the old committed one as before.

Also fixed the GWT resource-type 'clean' task which cleaned too much! ;)


Modified: public/yanel/trunk/src/build/resource-types/GWT-RT.build.xml
===================================================================
--- public/yanel/trunk/src/build/resource-types/GWT-RT.build.xml	2010-01-14 10:11:41 UTC (rev 47048)
+++ public/yanel/trunk/src/build/resource-types/GWT-RT.build.xml	2010-01-14 10:33:34 UTC (rev 47049)
@@ -67,13 +67,15 @@
     </path>
   </target>
 
-  <target name="clean" depends="yanel-resource-type.clean, init" description="Remove previous build">
+  <target name="clean" depends="yanel-resource-type.clean, gwt:clean"/>
+
+  <target name="gwt:clean" depends="init">
     <delete dir="${component.build.dir}/${module.name}"/>
   </target>
 
   <target name="compile" depends="yanel-resource-type.compile, gwt:compile" description="Compile Java classes and GWT files"/>
 
-  <target name="gwt:compile" depends="clean" description="Compile GWT files">
+  <target name="gwt:compile" depends="gwt:clean" description="Compile GWT files">
 
     <echo>Module name: ${module.name}</echo>
     <echo>Component build directory: ${component.build.dir}</echo>

Modified: public/yanel/trunk/src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyManagerResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyManagerResource.java	2010-01-14 10:11:41 UTC (rev 47048)
+++ public/yanel/trunk/src/contributions/resources/policymanager/src/java/org/wyona/yanel/impl/resources/policymanager/PolicyManagerResource.java	2010-01-14 10:33:34 UTC (rev 47049)
@@ -136,10 +136,10 @@
                     sb.append("<title>Edit Access Policy</title>");
                     sb.append("<meta name=\"generator\" content=\"" + this.getClass().getName() + "\"/>");
 
-                    sb.append("<link rel=\"stylesheet\" href=\"" + PathUtil.getResourcesHtdocsPath(this) + "js/accesspolicyeditor/style.css\" type=\"text/css\"/>");
+                    sb.append("<link rel=\"stylesheet\" href=\"" + PathUtil.getResourcesHtdocsPath(this) + "org.wyona.security.gwt.accesspolicyeditor.AccessPolicyEditor/style.css\" type=\"text/css\"/>");
 
                     // IMPORTANT: Please make sure that the value of 'cancel-url-base-equals-host-page-url' corresponds with getReferer()
-                    sb.append("<script language=\"javascript\">var getURLs = {\"identities-url\": \"" + identitiesURL + "\", \"policy-url\": \"" + policyURL + "\", \"cancel-url\": \"" + cancelURL + "\", \"cancel-url-base-equals-host-page-url\": \"false\", \"save-url\": \"" + saveURL + "\"};</script><script language=\"javascript\" src=\"" +  PathUtil.getResourcesHtdocsPath(this) + "js/accesspolicyeditor/org.wyona.security.gwt.accesspolicyeditor.AccessPolicyEditor.nocache.js\"></script>");
+                    sb.append("<script language=\"javascript\">var getURLs = {\"identities-url\": \"" + identitiesURL + "\", \"policy-url\": \"" + policyURL + "\", \"cancel-url\": \"" + cancelURL + "\", \"cancel-url-base-equals-host-page-url\": \"false\", \"save-url\": \"" + saveURL + "\"};</script><script language=\"javascript\" src=\"" +  PathUtil.getResourcesHtdocsPath(this) + "org.wyona.security.gwt.accesspolicyeditor.AccessPolicyEditor/org.wyona.security.gwt.accesspolicyeditor.AccessPolicyEditor.nocache.js\"></script>");
 
                     sb.append("</head>");
                     sb.append("<body><h1>Edit Access Policy</h1><p><div id=\"access-policy-editor-hook\"></div></p></body></html>");