inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

- fixing build of sample website to produce a war instead of a zip

Browse Source 
- fixing creating content with patterns starting with directories (had to reorder call to resetLayer)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4464 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ariel Backenroth
2006-11-29 22:02:22 +00:00
parent b6049d4b9e
commit 201c1df23d
2 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
project-build.xml
View File

@@ -110,31 +110,30 @@
<fileset dir="${dir.build}/sample-website"/> <fileset dir="${dir.build}/sample-website"/>
</delete> </delete>
<mkdir dir="${dir.build}/sample-website/alfresco"/> <mkdir dir="${dir.build}/sample-website/alfresco"/>
<copy todir="${dir.build}/sample-website/alfresco"> <mkdir dir="${dir.build}/sample-website/alfresco/classes"/>
<fileset dir="${dir.src}/test-resources/websites/alfresco" excludes="**/.svn"/>
</copy>
<javac srcdir="${dir.src}/test-resources/websites/alfresco/ROOT/WEB-INF/classes" <javac srcdir="${dir.src}/test-resources/websites/alfresco/ROOT/WEB-INF/classes"
destdir="${dir.build}/sample-website/alfresco/ROOT/WEB-INF/classes" destdir="${dir.build}/sample-website/alfresco/classes"
deprecation="on" debug="on" target="1.5" source="1.5" deprecation="on" debug="on" target="1.5" source="1.5"
classpathref="classpath.compile"/> classpathref="classpath.compile"/>
<mkdir dir="${dir.build}/sample-website/alfresco/ROOT/WEB-INF/lib"/>
<jar basedir="${dir.build}/classes" <jar basedir="${dir.build}/classes"
destfile="${dir.build}/sample-website/alfresco/ROOT/WEB-INF/lib/alfresco-form-data-functions.jar" destfile="${dir.build}/sample-website/alfresco/alfresco-form-data-functions.jar"
includes="org/alfresco/web/forms/*.class"/> includes="org/alfresco/web/forms/*.class"/>
<jar basedir="${dir.build}/sample-website/alfresco/ROOT/WEB-INF/classes" <jar basedir="${dir.build}/sample-website/alfresco/classes"
destfile="${dir.build}/sample-website/alfresco/ROOT/WEB-INF/lib/alfresco-sample-website.jar" destfile="${dir.build}/sample-website/alfresco/alfresco-sample-website.jar"
includes="**/*.class"/> includes="**/*.class"/>
<delete> <mkdir dir="${dir.dist}"/>
<fileset dir="${dir.build}/sample-website/alfresco/ROOT/WEB-INF/classes" includes="**/*.class"/> <war destfile="${dir.dist}/alfresco-sample-website.war"
</delete> webxml="${dir.src}/test-resources/websites/alfresco/ROOT/WEB-INF/web.xml">
<copy todir="${dir.build}/sample-website/alfresco/ROOT/WEB-INF/lib"> <lib dir="${dir.common.lib}">
<fileset dir="${dir.common.lib}">
<include name="standard.jar"/> <include name="standard.jar"/>
<include name="jstl.jar"/> <include name="jstl.jar"/>
</lib>
<lib dir="${dir.build}/sample-website/alfresco"/>
<fileset dir="${dir.src}/test-resources/websites/alfresco/ROOT">
<exclude name="WEB-INF/**"/>
<exclude name="**/.svn"/>
</fileset> </fileset>
</copy> <webinf file="${dir.src}/test-resources/websites/alfresco/ROOT/WEB-INF/pr.tld"/>
<mkdir dir="${dir.dist}"/> </war>
<zip destfile="${dir.dist}/alfresco-sample-website.zip"
basedir="${dir.build}/sample-website/alfresco"/>
</target> </target>
</project> </project>

18
source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
View File

@@ -299,6 +299,7 @@ public class CreateWebContentWizard extends BaseContentWizard
@Override @Override
protected void saveContent(File fileContent, String strContent) throws Exception protected void saveContent(File fileContent, String strContent) throws Exception
{ {
final FormsService fs = FormsService.getInstance();
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
logger.debug("saving file content to " + this.fileName); logger.debug("saving file content to " + this.fileName);
// get the parent path of the location to save the content // get the parent path of the location to save the content
@@ -306,7 +307,7 @@ public class CreateWebContentWizard extends BaseContentWizard
path = path.replaceFirst(AVMConstants.STORE_MAIN, AVMConstants.STORE_PREVIEW); path = path.replaceFirst(AVMConstants.STORE_MAIN, AVMConstants.STORE_PREVIEW);
if (MimetypeMap.MIMETYPE_XML.equals(this.mimeType) && this.formName != null) if (MimetypeMap.MIMETYPE_XML.equals(this.mimeType) && this.formName != null)
{ {
final FormsService fs = FormsService.getInstance();
final Document formInstanceData = (fileContent != null final Document formInstanceData = (fileContent != null
? fs.parseXML(fileContent) ? fs.parseXML(fileContent)
: fs.parseXML(strContent)); : fs.parseXML(strContent));
@@ -315,15 +316,22 @@ public class CreateWebContentWizard extends BaseContentWizard
final String[] sb = AVMNodeConverter.SplitBase(path); final String[] sb = AVMNodeConverter.SplitBase(path);
path = sb[0]; path = sb[0];
this.fileName = sb[1]; this.fileName = sb[1];
fs.makeAllDirectories(path);
} }
if (logger.isDebugEnabled())
logger.debug("reseting layer " + path.split(":")[0] + ":/" + AVMConstants.DIR_APPBASE);
this.avmSyncService.resetLayer(path.split(":")[0] + ":/" + AVMConstants.DIR_APPBASE);
if (logger.isDebugEnabled())
logger.debug("creating all directories in path " + path);
fs.makeAllDirectories(path);
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
logger.debug("creating file " + this.fileName + " in " + path); logger.debug("creating file " + this.fileName + " in " + path);
this.avmSyncService.resetLayer(path.split(":")[0] + ":/" + AVMConstants.DIR_APPBASE);
// put the content of the file into the AVM store // put the content of the file into the AVM store
if (fileContent != null) if (fileContent != null)
{ {