svn commit: r1347478 - in /ofbiz/trunk: ./ applications/content/ applications/content/lib/ framework/ framework/base/config/ framework/base/lib/ framework/jcr/ specialpurpose/example/ specialpurpose/example/config/ specialpurpose/example/src/org
Locked
svn commit: r1347478 - in /ofbiz/trunk: ./ applications/content/ applications/content/lib/ framework/ framework/base/config/ framework/base/lib/ framework/jcr/ specialpurpose/example/ specialpurpose/example/config/ specialpurpose/example/src/org
 
|
Author: jacopoc
Date: Thu Jun 7 08:14:28 2012 New Revision: 1347478 URL: http://svn.apache.org/viewvc?rev=1347478&view=rev Log: As discussed in the dev list, removed the experimental jcr component; its development will continue in the proper branch. Added: ofbiz/trunk/applications/content/lib/tika-core-1.0.jar (props changed) - copied unchanged from r1343543, ofbiz/trunk/framework/jcr/lib/tika-core-1.0.jar ofbiz/trunk/applications/content/lib/tika-parsers-1.0.jar (props changed) - copied unchanged from r1343543, ofbiz/trunk/framework/jcr/lib/tika-parsers-1.0.jar ofbiz/trunk/framework/base/lib/slf4j-log4j12-1.6.4.jar (with props) Removed: ofbiz/trunk/framework/base/lib/jcl-over-slf4j-1.6.4.jar ofbiz/trunk/framework/base/lib/slf4j-simple-1.6.4.jar ofbiz/trunk/framework/jcr/ ofbiz/trunk/specialpurpose/example/src/org/ofbiz/example/JackrabbitEvents.java ofbiz/trunk/specialpurpose/example/webapp/example/jackrabbit/ ofbiz/trunk/specialpurpose/example/widget/example/ExampleJackrabbitForms.xml ofbiz/trunk/specialpurpose/example/widget/example/ExampleJackrabbitScreens.xml Modified: ofbiz/trunk/.classpath ofbiz/trunk/.gitignore ofbiz/trunk/applications/content/build.xml ofbiz/trunk/build.xml ofbiz/trunk/framework/base/config/ofbiz-containers.xml ofbiz/trunk/framework/base/config/test-containers.xml ofbiz/trunk/framework/build.xml ofbiz/trunk/framework/component-load.xml ofbiz/trunk/specialpurpose/example/build.xml ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml ofbiz/trunk/specialpurpose/example/widget/example/CommonScreens.xml ofbiz/trunk/specialpurpose/example/widget/example/ExampleMenus.xml ofbiz/trunk/specialpurpose/exampleext/widget/example/CommonScreens.xml Modified: ofbiz/trunk/.classpath URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1347478&r1=1347477&r2=1347478&view=diff ============================================================================== --- ofbiz/trunk/.classpath (original) +++ ofbiz/trunk/.classpath Thu Jun 7 08:14:28 2012 @@ -11,6 +11,8 @@ <classpathentry kind="lib" path="applications/content/lib/poi-ooxml-3.8-20120326.jar"/> <classpathentry kind="lib" path="applications/content/lib/poi-ooxml-schemas-3.8-20120326.jar"/> <classpathentry kind="lib" path="applications/content/lib/poi-scratchpad-3.8-20120326.jar"/> + <classpathentry kind="lib" path="applications/content/lib/tika-core-1.0.jar"/> + <classpathentry kind="lib" path="applications/content/lib/tika-parsers-1.0.jar"/> <classpathentry kind="lib" path="applications/product/lib/watermarker-0.0.4.jar"/> <classpathentry kind="lib" path="applications/product/lib/dozer-4.2.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/ant-1.8.4.jar"/> @@ -117,15 +119,6 @@ <classpathentry kind="lib" path="framework/entity/lib/ofbiz-minerva.jar"/> <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-2.1.1.jar"/> <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-2.1.1.jar"/> - <classpathentry kind="lib" path="framework/jcr/lib/concurrent-1.3.4.jar"/> - <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-api-2.3.3.jar"/> - <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-core-2.3.3.jar"/> - <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-jca-2.3.3.jar"/> - <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-jcr-commons-2.3.3.jar"/> - <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-spi-2.3.3.jar"/> - <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-spi-commons-2.3.3.jar"/> - <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-ocm-2.0.jar" sourcepath="/ocm"/> - <classpathentry kind="lib" path="framework/jcr/lib/jcr-2.0.jar"/> <classpathentry kind="lib" path="framework/jetty/lib/com.sun.el-2.2.0.v201108011116.jar"/> <classpathentry kind="lib" path="framework/jetty/lib/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar"/> <classpathentry kind="lib" path="framework/jetty/lib/jetty-ajp-8.1.2.v20120308.jar"/> @@ -194,7 +187,6 @@ <classpathentry excluding="org/ofbiz/entity/connection/XaPoolConnectionFactory.java" kind="src" path="framework/entity/src"/> <classpathentry kind="src" path="framework/entityext/src"/> <classpathentry kind="src" path="framework/geronimo/src"/> - <classpathentry kind="src" path="framework/jcr/src"/> <classpathentry kind="src" path="framework/jetty/src"/> <classpathentry kind="src" path="framework/minilang/src"/> <classpathentry kind="src" path="framework/security/src"/> @@ -221,7 +213,5 @@ <classpathentry kind="src" path="specialpurpose/webpos/src"/> <classpathentry kind="src" path="specialpurpose/workflow/src"/> <classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/> - <classpathentry kind="lib" path="framework/jcr/lib/tika-core-1.0.jar"/> - <classpathentry kind="lib" path="framework/jcr/lib/tika-parsers-1.0.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: ofbiz/trunk/.gitignore URL: http://svn.apache.org/viewvc/ofbiz/trunk/.gitignore?rev=1347478&r1=1347477&r2=1347478&view=diff ============================================================================== --- ofbiz/trunk/.gitignore (original) +++ ofbiz/trunk/.gitignore Thu Jun 7 08:14:28 2012 @@ -21,8 +21,6 @@ runtime/logs/*.log* runtime/logs/*.html* runtime/logs/test-results/* runtime/data/derby/* -runtime/data/jcr/* -runtime/data/jcr-test/* runtime/data/utilcache.* runtime/catalina/work/* runtime/jetty Modified: ofbiz/trunk/applications/content/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/build.xml?rev=1347478&r1=1347477&r2=1347478&view=diff ============================================================================== --- ofbiz/trunk/applications/content/build.xml (original) +++ ofbiz/trunk/applications/content/build.xml Thu Jun 7 08:14:28 2012 @@ -47,7 +47,6 @@ under the License. <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/> <fileset dir="../../framework/widget/build/lib" includes="*.jar"/> <fileset dir="../../framework/common/build/lib" includes="*.jar"/> - <fileset dir="../../framework/jcr/lib" includes="*.jar"/> </path> <patternset id="src.exc.set"> Propchange: ofbiz/trunk/applications/content/lib/tika-core-1.0.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Propchange: ofbiz/trunk/applications/content/lib/tika-parsers-1.0.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: ofbiz/trunk/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1347478&r1=1347477&r2=1347478&view=diff ============================================================================== --- ofbiz/trunk/build.xml (original) +++ ofbiz/trunk/build.xml Thu Jun 7 08:14:28 2012 @@ -1058,7 +1058,7 @@ under the License. <property name="sonar.sources" value="framework/appserver/src, framework/base/src, framework/bi/src, framework/birt/src, framework/catalina/src, framework/common/src, framework/datafile/src, framework/entity/src, framework/entityext/src, - framework/example/src, framework/geronimo/src, framework/jetty/src, framework/jcr/src, + framework/example/src, framework/geronimo/src, framework/jetty/src, framework/minilang/src, framework/security/src, framework/service/src, framework/sql/src, framework/start/src, framework/testtools/src, framework/webapp/src, framework/webtools/src, framework/widget/src, applications/accounting/src, applications/commonext/src, applications/content/src, applications/humanres/src, @@ -1068,7 +1068,7 @@ under the License. specialpurpose/googlecheckout/src, specialpurpose/hhfacility/src, specialpurpose/oagis/src, specialpurpose/pos/src, specialpurpose/scrum/src" /> <property name="sonar.tests" value="framework/base/src/org/ofbiz/base/test, framework/entity/src/org/ofbiz/entity/test, - framework/jcr/src/org/ofbiz/jcr/test, framework/service/src/org/ofbiz/service/test, framework/sql/src/org/ofbiz/sql/test, + framework/service/src/org/ofbiz/service/test, framework/sql/src/org/ofbiz/sql/test, applications/accounting/src/org/ofbiz/accounting/test, applications/content/src/org/ofbiz/content/test, applications/product/src/org/ofbiz/product/test, applications/product/src/org/ofbiz/shipment/test, applications/securityext/src/org/ofbiz/securityext/test" /> Modified: ofbiz/trunk/framework/base/config/ofbiz-containers.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/ofbiz-containers.xml?rev=1347478&r1=1347477&r2=1347478&view=diff ============================================================================== --- ofbiz/trunk/framework/base/config/ofbiz-containers.xml (original) +++ ofbiz/trunk/framework/base/config/ofbiz-containers.xml Thu Jun 7 08:14:28 2012 @@ -74,13 +74,6 @@ under the License. </container> --> - <!-- Load embedded Jackrabbit content repository. Since this container depends - upon JNDI, it must be started after the naming-container container.--> - <container name="jcr-container" class="org.ofbiz.jcr.loader.JCRContainer"> - <property name="configFilePath" value="framework/jcr/config/jcr-config.xml"/> - <property name="removeOnShutdown" value="false"/> - </container> - <!-- load catalina (tomcat) and all web applications --> <container name="catalina-container" class="org.ofbiz.catalina.container.CatalinaContainer"> <!-- static configuration for tomcat --> Modified: ofbiz/trunk/framework/base/config/test-containers.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/test-containers.xml?rev=1347478&r1=1347477&r2=1347478&view=diff ============================================================================== --- ofbiz/trunk/framework/base/config/test-containers.xml (original) +++ ofbiz/trunk/framework/base/config/test-containers.xml Thu Jun 7 08:14:28 2012 @@ -50,13 +50,6 @@ under the License. <property name="ssl-client-auth" value="true"/> </container> - <!-- Load embedded Jackrabbit content repository. Since this container depends - upon JNDI, it must be started after the naming-container container.--> - <container name="jcr-container" class="org.ofbiz.jcr.loader.JCRContainer"> - <property name="configFilePath" value="framework/jcr/config/jcr-test-config.xml"/> - <property name="removeRepositoryOnShutdown" value="true"/> - </container> - <!-- load catalina (tomcat) and all web applications --> <container name="catalina-container" class="org.ofbiz.catalina.container.CatalinaContainer"> <!-- static configuration for tomcat --> Added: ofbiz/trunk/framework/base/lib/slf4j-log4j12-1.6.4.jar URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/slf4j-log4j12-1.6.4.jar?rev=1347478&view=auto ============================================================================== Binary file - no diff available. Propchange: ofbiz/trunk/framework/base/lib/slf4j-log4j12-1.6.4.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: ofbiz/trunk/framework/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/build.xml?rev=1347478&r1=1347477&r2=1347478&view=diff ============================================================================== --- ofbiz/trunk/framework/build.xml (original) +++ ofbiz/trunk/framework/build.xml Thu Jun 7 08:14:28 2012 @@ -25,7 +25,7 @@ under the License. files="start/build.xml,base/build.xml,sql/build.xml, entity/build.xml,geronimo/build.xml, catalina/build.xml,jetty/build.xml, - security/build.xml,service/build.xml,jcr/build.xml,entityext/build.xml, + security/build.xml,service/build.xml,entityext/build.xml, bi/build.xml,minilang/build.xml, webapp/build.xml,widget/build.xml, common/build.xml,datafile/build.xml,birt/build.xml, Modified: ofbiz/trunk/framework/component-load.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/component-load.xml?rev=1347478&r1=1347477&r2=1347478&view=diff ============================================================================== --- ofbiz/trunk/framework/component-load.xml (original) +++ ofbiz/trunk/framework/component-load.xml Thu Jun 7 08:14:28 2012 @@ -32,7 +32,6 @@ under the License. <load-component component-location="common"/> <load-component component-location="service"/> <load-component component-location="entityext"/> - <load-component component-location="jcr"/> <load-component component-location="bi"/> <load-component component-location="birt"/> <load-component component-location="webapp"/> Modified: ofbiz/trunk/specialpurpose/example/build.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/build.xml?rev=1347478&r1=1347477&r2=1347478&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/example/build.xml (original) +++ ofbiz/trunk/specialpurpose/example/build.xml Thu Jun 7 08:14:28 2012 @@ -51,7 +51,5 @@ under the License. <fileset dir="../../framework/webapp/lib" includes="*.jar"/> <fileset dir="../../framework/webapp/build/lib" includes="*.jar"/> <fileset dir="../../framework/common/build/lib" includes="*.jar"/> - <fileset dir="../../framework/jcr/lib" includes="*.jar"/> - <fileset dir="../../framework/jcr/build/lib" includes="*.jar"/> </path> </project> Modified: ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml?rev=1347478&r1=1347477&r2=1347478&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml (original) +++ ofbiz/trunk/specialpurpose/example/config/ExampleUiLabels.xml Thu Jun 7 08:14:28 2012 @@ -19,34 +19,6 @@ under the License. --> <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <property key="ExampelsJackrabbitDownloadFile"> - <value xml:lang="de">Datei herunterladen</value> - <value xml:lang="en">Download file</value> - </property> - <property key="ExampelsJackrabbitOpenData"> - <value xml:lang="de">Content öffnen.</value> - <value xml:lang="en">Open content.</value> - </property> - <property key="ExampelsJackrabbitOpenFile"> - <value xml:lang="de">Datei öffnen</value> - <value xml:lang="en">Open file</value> - </property> - <property key="ExampelsJackrabbitRemoveData"> - <value xml:lang="de">Content löschen.</value> - <value xml:lang="en">Remove content.</value> - </property> - <property key="ExampelsJackrabbitRemoveFile"> - <value xml:lang="de">Datei löschen</value> - <value xml:lang="en">Remove file</value> - </property> - <property key="ExampleAddNewContentEntry"> - <value xml:lang="de">Einen neuen Content Eintrag hinzufügen</value> - <value xml:lang="en">Add a new content entry</value> - </property> - <property key="ExampleAddNewNodePath"> - <value xml:lang="de">Füge einen neuen Node Pfad hinzu, z.B. /Foo/Baa speichert die Datei im Ordner "Baa"</value> - <value xml:lang="en">Add a (new) node path like /Foo/Baa will store the file under the folder "Baa"</value> - </property> <property key="ExampleAjaxExamples"> <value xml:lang="en">Ajax Examples</value> <value xml:lang="fr">Exemples Ajax</value> @@ -505,42 +477,6 @@ <value xml:lang="it">Gruppi campi</value> <value xml:lang="zh">æ°æ®é¡¹ç»</value> </property> - <property key="ExampleJackrabbitCleanRepository"> - <value xml:lang="de">Repository aufräumen</value> - <value xml:lang="en">Clean repository</value> - </property> - <property key="ExampleJackrabbitCleanRepositoryTooltip"> - <value xml:lang="de">Löscht alle Nodes aus dem Repository, die keine Verkünpfung in der Content Tabelle haben.</value> - <value xml:lang="en">Removes all nodes which are not linked in the content table.</value> - </property> - <property key="ExampleJackrabbitListNodes"> - <value xml:lang="de">Liste alles Knoten</value> - <value xml:lang="en">List Nodes</value> - </property> - <property key="ExampleJackrabbitQueryForContent"> - <value xml:lang="de">Das Repository kann mit Hilfe der SQL2 oder JQOM Query Language durchsucht werden: z.B. SELECT * FROM [nt:unstructured] gibt alle nodes vom Typ nt:unstructured zurück.</value> - <value xml:lang="en">You can search the repository by using SQL2 or JQOM query syntax: i.e. SELECT * FROM [nt:unstructured] gives all nodes with the typ nt:unstructured.</value> - </property> - <property key="ExampleJackrabbitQuickContentSelect"> - <value xml:lang="de">Content Schnellauswahl - Content Node auswählen und Sprache bestimmen.</value> - <value xml:lang="en">Content quick select - Choose your content node and select a language.</value> - </property> - <property key="ExampleJackrabbitShowContentData"> - <value xml:lang="de">(Text) Content anzeigen</value> - <value xml:lang="en">Show (text) content</value> - </property> - <property key="ExampleJackrabbitShowUploadedFiles"> - <value xml:lang="de">Dateien anzeigen</value> - <value xml:lang="en">Show uploaded Files</value> - </property> - <property key="ExampleJackrabbitTryRightClick"> - <value xml:lang="de">Wähle eine Datei und versuche einen Rechtklick</value> - <value xml:lang="en">Choose a file and try a 'right click'</value> - </property> - <property key="ExampleJackrabbitUploadFileData"> - <value xml:lang="de">Eine neue Datei speichern</value> - <value xml:lang="en">Upload a new file</value> - </property> <property key="ExampleLanguageTextVersion"> <value xml:lang="de">Verion der gewählten sprache</value> <value xml:lang="en">Version of the choosen language</value> @@ -826,10 +762,6 @@ <value xml:lang="th">à¹à¸à¹à¹à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸±à¸§à¸à¸¢à¹à¸²à¸</value> <value xml:lang="zh">ç¼è¾æ ·ä¾æç»</value> </property> - <property key="PageTitleExampleJackrabbit"> - <value xml:lang="de">Jackrabbit</value> - <value xml:lang="en">Jackrabbit</value> - </property> <!-- Page Titles --> <property key="PageTitleFindExample"> <value xml:lang="en">Find Example</value> Modified: ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml?rev=1347478&r1=1347477&r2=1347478&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml (original) +++ ofbiz/trunk/specialpurpose/example/webapp/example/WEB-INF/controller.xml Thu Jun 7 08:14:28 2012 @@ -236,95 +236,6 @@ under the License. </request-map> <!-- end of request mappings --> - <!-- Jackrabbit Example Requests --> - <request-map uri="ExampleJackrabbit"> - <security auth="true" https="true" /> - <response name="success" type="view" value="ExampleJackrabbit" /> - <response name="error" type="view" value="ExampleJackrabbit" /> - </request-map> - <request-map uri="ExampleJackrabbitAddData"> - <security auth="true" https="true" /> - <response name="success" type="view" value="ExampleJackrabbitAddData" /> - <response name="error" type="view" value="ExampleJackrabbitAddData" /> - </request-map> - <request-map uri="StoreNewRepositoryData"> - <security auth="true" https="true" /> - <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="addNewTextMessageToJcrRepository" /> - <response name="success" type="request" value="ExampleJackrabbitShowContentData" /> - <response name="error" type="view" value="ExampleJackrabbitAddData" /> - </request-map> - <request-map uri="ExampleJackrabbitScanRepositoryStructure"> - <security auth="true" https="true" /> - <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="scanRepositoryStructure"/> - <response name="success" type="view" value="ExampleJackrabbitScanRepositoryStructure" /> - <response name="error" type="view" value="ExampleJackrabbitScanRepositoryStructure" /> - </request-map> - <request-map uri="EditRepositoryContent"> - <security auth="true" https="true" /> - <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="getNodeContent"/> - <response name="success" type="view" value="ExampleJackrabbitEditRepositoryContent" /> - <response name="error" type="request" value="ExampleJackrabbitShowContentData" /> - </request-map> - <request-map uri="UpdateRepositoryData"> - <security auth="true" https="true" /> - <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="updateRepositoryData"/> - <response name="success" type="request" value="EditRepositoryContent" /> - <response name="error" type="request" value="EditRepositoryContent" /> - </request-map> - <request-map uri="RemoveRepositoryNode"> - <security auth="true" https="true" /> - <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="removeRepositoryNode"/> - <response name="success" type="request" value="ExampleJackrabbitShowContentData" /> - <response name="error" type="request" value="ExampleJackrabbitShowContentData" /> - </request-map> - <request-map uri="RemoveRepositoryFile"> - <security auth="true" https="true" /> - <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="removeRepositoryNode"/> - <response name="success" type="request" value="ExampleJackrabbitShowUploadedFiles" /> - <response name="error" type="request" value="ExampleJackrabbitShowUploadedFiles" /> - </request-map> - <request-map uri="ExampleJackrabbitUploadFileData"> - <security auth="true" https="true" /> - <response name="success" type="view" value="ExampleJackrabbitUploadFileData" /> - <response name="error" type="view" value="ExampleJackrabbitUploadFileData" /> - </request-map> - <request-map uri="StoreNewRepositoryFileData"> - <security auth="true" https="true" /> - <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="uploadFileData"/> - <response name="success" type="request" value="ExampleJackrabbitShowUploadedFiles" /> - <response name="error" type="view" value="ExampleJackrabbitUploadFileData" /> - </request-map> - <request-map uri="ExampleJackrabbitShowUploadedFiles"> - <security auth="true" https="true" /> - <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="getRepositoryFileTree"/> - <response name="success" type="view" value="ExampleJackrabbitShowUploadedFiles" /> - <response name="error" type="view" value="ExampleJackrabbitShowUploadedFiles" /> - </request-map> - <request-map uri="GetFileFromRepository"> - <security auth="true" https="true" /> - <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="getFileFromRepository"/> - <response name="success" type="none" /> - <response name="error" type="none" /> - </request-map> - <request-map uri="ExampleJackrabbitShowContentData"> - <security auth="true" https="true" /> - <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="getRepositoryDataTree"/> - <response name="success" type="view" value="ExampleJackrabbitShowContentData"/> - <response name="error" type="view" value="ExampleJackrabbitShowContentData"/> - </request-map> - <request-map uri="OpenFileInformation"> - <security auth="true" https="true" /> - <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="getFileInformation"/> - <response name="success" type="view" value="ExampleJackrabbitOpenFileInformation"/> - <response name="error" type="view" value="ExampleJackrabbitShowUploadedFiles"/> - </request-map> - <request-map uri="QueryRepositoryData"> - <security auth="true" https="true" /> - <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="queryRepositoryData"/> - <response name="success" type="view" value="ExampleJackrabbitShowQueryResult"/> - <response name="error" type="request" value="ExampleJackrabbitShowContentData"/> - </request-map> - <!-- View Mappings --> <view-map name="main" type="screen" page="component://example/widget/example/CommonScreens.xml#main"/> @@ -369,18 +280,6 @@ under the License. <view-map name="ExampleBarChart" page="component://example/widget/example/ExampleScreens.xml#ExampleBarChart" type="screen"/> <view-map name="ExamplePieChart" page="component://example/widget/example/ExampleScreens.xml#ExamplePieChart" type="screen"/> - <!-- Jackrabbit View Mapping --> - <view-map name="ExampleJackrabbit" page="component://example/widget/example/ExampleJackrabbitScreens.xml#ListRepositoryData" type="screen" /> - <view-map name="ExampleJackrabbitAddData" page="component://example/widget/example/ExampleJackrabbitScreens.xml#ExampleJackrabbitAddData" type="screen" /> - <view-map name="ExampleJackrabbitScanRepositoryStructure" page="component://example/widget/example/ExampleJackrabbitScreens.xml#ExampleJackrabbitScanRepositoryStructure" type="screen" /> - <view-map name="ExampleJackrabbitEditRepositoryContent" page="component://example/widget/example/ExampleJackrabbitScreens.xml#ExampleJackrabbitEditRepositoryContent" type="screen" /> - <view-map name="ExampleJackrabbitUploadFileData" page="component://example/widget/example/ExampleJackrabbitScreens.xml#ExampleJackrabbitUploadFileData" type="screen" /> - <view-map name="ExampleJackrabbitShowUploadedFiles" page="component://example/widget/example/ExampleJackrabbitScreens.xml#ExampleJackrabbitShowUploadedFiles" type="screen" /> - <view-map name="ExampleJackrabbitShowContentData" page="component://example/widget/example/ExampleJackrabbitScreens.xml#ExampleJackrabbitShowContentData" type="screen" /> - <view-map name="ExampleJackrabbitOpenFileInformation" page="component://example/widget/example/ExampleJackrabbitScreens.xml#ExampleJackrabbitShowFileInformation" type="screen" /> - <view-map name="ExampleJackrabbitShowQueryResult" page="component://example/widget/example/ExampleJackrabbitScreens.xml#ExampleJackrabbitShowQueryResult" type="screen" /> - - <!-- Supported Content Types --> <!-- text/html Modified: ofbiz/trunk/specialpurpose/example/widget/example/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/example/CommonScreens.xml?rev=1347478&r1=1347477&r2=1347478&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/example/widget/example/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/example/widget/example/CommonScreens.xml Thu Jun 7 08:14:28 2012 @@ -294,32 +294,6 @@ under the License. </section> </screen> - <screen name="CommonExampleJackrabbitDecorator"> - <section> - <actions> - <set field="headerItem" value="ExampleJackrabbit" /> - <set field="labelFieldName" value="exampleTypeId" /> - <set field="dataFieldName" value="total" /> - </actions> - <widgets> - <decorator-screen name="main-decorator" - location="${parameters.mainDecoratorLocation}"> - <decorator-section name="pre-body"> - <include-menu name="ExampleJackrabbit" location="component://example/widget/example/ExampleMenus.xml"/> - </decorator-section> - <decorator-section name="body"> - <container style="clear" /> - <section> - <widgets> - <decorator-section-include name="body" /> - </widgets> - </section> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="main"> <!-- This is the screen for the Main page in the Example component. A common pattern in OFBiz is to have each component include a Main page as a starting point for Modified: ofbiz/trunk/specialpurpose/example/widget/example/ExampleMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/example/widget/example/ExampleMenus.xml?rev=1347478&r1=1347477&r2=1347478&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/example/widget/example/ExampleMenus.xml (original) +++ ofbiz/trunk/specialpurpose/example/widget/example/ExampleMenus.xml Thu Jun 7 08:14:28 2012 @@ -48,7 +48,6 @@ under the License. <menu-item name="ExampleCharts" title="Chart examples"> <link target="ExampleBarChart"/> </menu-item> - <menu-item name="ExampleJackrabbit" title="${uiLabelMap.PageTitleExampleJackrabbit}"><link target="ExampleJackrabbitShowContentData"/></menu-item> </menu> <menu name="EditExample" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> @@ -102,12 +101,4 @@ under the License. <menu-item name="ExampleBarChart" title="Bar chart"><link target="ExampleBarChart"/></menu-item> <menu-item name="ExamplePieChart" title="Pie chart"><link target="ExamplePieChart"/></menu-item> </menu> - - <menu name="ExampleJackrabbit" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> - <menu-item name="ExampleJackrabbitShowContentData" title="${uiLabelMap.ExampleJackrabbitShowContentData}"><link target="ExampleJackrabbitShowContentData"/></menu-item> - <menu-item name="ExampleJackrabbitAddData" title="${uiLabelMap.ExampleAddNewContentEntry}"><link target="ExampleJackrabbitAddData"/></menu-item> - <menu-item name="ExampleJackrabbitUploadFileData" title="${uiLabelMap.ExampleJackrabbitUploadFileData}"><link target="ExampleJackrabbitUploadFileData"/></menu-item> - <menu-item name="ExampleJackrabbitShowUploadedFiles" title="${uiLabelMap.ExampleJackrabbitShowUploadedFiles}"><link target="ExampleJackrabbitShowUploadedFiles"/></menu-item> - <menu-item name="ExampleJackrabbitScanRepositoryStrukture" title="${uiLabelMap.ExampleScanRepositoryStrukture}"><link target="ExampleJackrabbitScanRepositoryStructure"/></menu-item> - </menu> </menus> Modified: ofbiz/trunk/specialpurpose/exampleext/widget/example/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/exampleext/widget/example/CommonScreens.xml?rev=1347478&r1=1347477&r2=1347478&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/exampleext/widget/example/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/exampleext/widget/example/CommonScreens.xml Thu Jun 7 08:14:28 2012 @@ -117,12 +117,4 @@ under the License. </widgets> </section> </screen> - <screen name="CommonExampleJackrabbitDecorator"> - <section> - <widgets> - <include-screen name="CommonExampleJackrabbitDecorator" location="component://example/widget/example/CommonScreens.xml"/> - </widgets> - </section> - </screen> - </screens> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |