Commit Graph

27 Commits

Author SHA1 Message Date
Ariel Backenroth
ad43a4c904 updated xforms unit tests
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6821 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-18 17:17:42 +00:00
Derek Hulley
69694b7ac0 Merged V2.0 to HEAD
5456: (From WCM_DEPLOY)

There were many pure conflicts on license headers, one conflict due to CR-LF and
some other smaller issues to resolve:
-----------------------------------------
Resolved (line endings not cr-lf):
   root\projects\repository\config\alfresco\public-services-context.xml

Reverted:
   root\projects\web-client\source\web\images\icons\ajax_anim.gif

Reverted or Resolved (License text conflicts):
   svn revert root\projects\jndi-client\source\java\org\alfresco\jndi\JndiTest.java
   svn resolved root\projects\jndi-client\source\java\org\alfresco\jndi\AVMFileDirContext.java
   svn revert root\projects\jndi-client\source\java\org\alfresco\jndi\AVMBulkLoader.java
   svn revert root\projects\jndi-client\source\java\org\alfresco\filter\CacheControlFilter.java
   svn revert root\projects\jndi-client\source\java\org\alfresco\filter\CacheControlFilterInfoBean.java
   svn revert -R root\projects\catalina-virtual\source\java\org\alfresco\mbeans
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\context\AVMStandardContext.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\loader\AVMWebappClassLoader.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\loader\AVMWebappLoader.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMResourceBinding.java
   svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHostConfig.java
      - why the change in method naming convention?
   svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHost.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\DefaultAVMResourceBinding.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\valve\AVMUrlValveTest.java
   svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\valve\AVMUrlValve.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHostMatch.java

Modified:
   root\projects\web-client\source\java\org\alfresco\web\ui\wcm\component\UIDeployWebsite.java (Kevin to check line 330)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5484 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-12 01:41:14 +00:00
Paul Holmes-Higgin
7fd19e7e88 Updated copyright
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5186 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-19 17:17:36 +00:00
Ariel Backenroth
f6bf4acd5d localizing xforms codebase. adding javascript hash for string used from js.
multibyte fixes

appearance hints for textareas (full = rich text editor, minimal = plain text)

using xs:string for xforms:textarea
using xs:normalizedString for xforms:input

IMPORTANT:  you will need to recreate all forms in the web project after i check this in.  and for any of your own forms, you need to use xs:normalizedString as the type for textfields.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5028 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-03 00:01:08 +00:00
Ariel Backenroth
b3820b575a updating servletcontextformdatafunctionsadapter for change to how getRealPath gets processed as a jndipath. updating press release form for changes to alfresco namespace.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4775 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-10 00:56:06 +00:00
Ariel Backenroth
e7c186b5dc forgot to add company footer back in.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4238 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-26 20:30:37 +00:00
Ariel Backenroth
07686ab8ce - adding in the structure for an XSL FO rendering engine
- terminology cleanups to model and screens
- extracting company-footer back into its own xsd; no reason to shove that feature in everyone's face.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4227 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-26 04:16:16 +00:00
Ariel Backenroth
3d6221f39e update to press release component of sample website
- adding sub navigation to press release page to generate navigation by category in xsl (demoware for virgin)
- adding sub navigation to index.jsp to generate navigation by category (also demoware for virgin)
- cleanup of freemarker template and all sorts of fancy xpath stuff
- putting the company footer data type directly in the press release.xsd rather than having a seperate xsd.  while this makes the form creation process a bit confusing, it demonstrates why the root element name field is there, and minimizes files.  also forced me to clean up some major overloading of pr:company_footer.

changes to form data functions
- renamed getXMLDocument and getXMLDocuments to parseXMLDocument since it's now returning the document element rather than documents so that xpath traversal works (also since the document is completely useless in the context of templates)

adding bsf.jar so that hopefully someday i can write extension functions in javascript within xsl templates (couldn't get it to work).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4217 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-24 22:43:05 +00:00
Ariel Backenroth
eeec32d5ce - fixing naming for variables passed to jsp, xsl and freemarker
- cleanup of generate and regenerate apis and adding documentation.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4203 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-24 00:33:52 +00:00
Ariel Backenroth
2b35eed0e0 - adding a freemarker sample to the sample webapp. using it to create the plain text version
- updates to sample website to use form data functions

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-23 03:56:47 +00:00
Ariel Backenroth
d9416e76f4 - adding a freemarker sample to the sample webapp. using it to create the plain text version
- updates to sample website to use form data functions

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4191 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-23 03:56:28 +00:00
Ariel Backenroth
0045372d4d - using server side includes in the sample website, both from jsp and xsl.
- using the form data functions from the press release xsl rather than the document() function
- adding lots of comments to the sample website code
- removing the company_footer subdirectory.  we can lump press release and company-footer xmls in the same content directory.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4186 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-22 05:52:07 +00:00
Ariel Backenroth
b068224185 - first pass at freemarker integration
- hello world freemarker template for simple test (works!)
- fixing edit-xml - it was referring to CreateXmlContentTypeWizard which was renamed yesterday
- separating out customer code from prototype util code in press release example.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4116 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-16 19:45:00 +00:00
Ariel Backenroth
ea6c85be54 - beginning to respect fixed values from xsd
- fixing bug with default values for select widgets
- some more unit tests for repeating items, and xsd attributes
- parsing xsd when creating the form and presenting a combobox with element names that are possible root tag names
- ensuring that there can't be multiple output methods that output the same extension
- moving createxmlcontenttype to createformwizard in wcm where it belongs.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4112 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-15 22:40:49 +00:00
Britt Park
a8d94489c0 This is a very rudimentary version of a WCM Workflow that uses
Workflow packages.  It's hooked up to the sumbit single file action in
the top level website screen in an exceedingly awkard way.  The UI
doesn't complain about anything, nor does it display the contents of
the package.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4099 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-11 23:02:35 +00:00
Ariel Backenroth
0091556e8d fixing up links in sample website so that there should be much fewer 404s since we're now using index.html in the welcome file list.
fixing up links to /media/releases for pages in the about section of the website (they point to /about/news)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4081 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-09 19:47:13 +00:00
Ariel Backenroth
591f91b26d - fixing issue with xsls and virtualized jsps in IE. IE really wants script tags to have a separate close tag
- fixing issue with deleting repeat instances and tinymce - it has to be disposed of properly.  should be good to go with IE for the preview now.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4062 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-08 03:14:53 +00:00
Ariel Backenroth
bac98e5e04 forgot to check in the plain text press release (which was kinda the whole point of all of this)...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4045 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-06 05:30:00 +00:00
Ariel Backenroth
d465973b34 - fix error in namespaces in get company footer
- add a very demoware ready sample multi channel output, meaning generating a really ugly plain text version of the press release and adding a link to it from the html version.
- removing the company footer xsl as it is no longer mandatory to have one
- passing more parameters to the xsl process - rather ugly implementation - needs to be revisited



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4044 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-06 04:00:21 +00:00
Ariel Backenroth
6da8f919df making the important flag in note default to false so that it doesn't have to be wiggled.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4021 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-04 16:01:16 +00:00
Ariel Backenroth
b1e5b3dfac -doing the jsp2.0 with the callout example from the sample website. for one, it seems to help avoid some errors i was seeing earlier with classcastexceptions (no clear understanding of why they were happening, but whatever). and it's a nicer example - the jsp is well formed xml and emits well formed xml. good learning experience for catching up with the latest of the jstl nonsense.
- cleaning up build procedure for the sample website - still not perfect, but better.
- removing default value for company footer for the xsd - i'll revisit how to set default values on dynamic callout types some other time.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3984 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-30 19:54:30 +00:00
Ariel Backenroth
0f2bf9a3e0 - preliminary support for callouts using xsd:include. rewriting links in the schema now to point at the virtualization server. not the best solution. but i couldn't get LSResourceResolver to work (would have been the elegant solution) since i don't have access to the DOMConfiguration object within chiba - works great in the schemaformbuilder.
- sample implementation of a callout in the alfresco sample website; using a jsp to produce an included xsd that lists all available company_footer.xmls
- moving stuff around.  XFormsbean is now in the xforms package rather than ajax package - more relevant to that codebase.
- consolidating SchemaFormBuilder into one class since the inheritance hierarchy made very little sense. 
- refactored some of the sample website to reduce java code in the jsps and begining to think about a generic utility library for callouts and jsps that want to access templating generated data.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3957 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-28 04:06:01 +00:00
Ariel Backenroth
1acc02ca35 - fixing some links within the sample website
- renaming everything about-blurb to company-footer.
- fixing nit picky presentation issues in the press release xsl



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3940 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-26 17:09:16 +00:00
Ariel Backenroth
f78c86f32c some fixes and cleanup to the press release xsl
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3929 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-26 01:27:34 +00:00
Ariel Backenroth
3dcbd24150 implementing a urlresolver for xsl so that we can include documents properly using the document function.
updates to press release xsds - it's now basically working.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3926 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-25 22:15:14 +00:00
Ariel Backenroth
a9dba4a907 a first pass at the press release form and xsl
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3912 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-25 04:09:45 +00:00
Ariel Backenroth
069649c8ed some fixes for reading in default values for checkboxes and dates. checking in some of my test xsds and xsls.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3908 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-24 16:51:47 +00:00