portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r774174 - in /portals/jetspeed-2/portal/trunk: ./ applications/jetspeed-demo/ applications/jetspeed/src/main/webapp/WEB-INF/pages/Public/ applications/jetspeed/src/main/webapp/decorations/layout/css/ applications/jetspeed/src/main/webapp/de...
Date Wed, 13 May 2009 02:51:18 GMT
Author: taylor
Date: Wed May 13 02:51:18 2009
New Revision: 774174

URL: http://svn.apache.org/viewvc?rev=774174&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-998
* Fix up the DB Browser demo, auto load a derby database, clean up css, bug fixes, improved
demo, enable titles per portlet
* include dbbrowser in build, installer and enterprise, test

Removed:
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/css/database-browser.css
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/css/tree-component.css
Modified:
    portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Public/db-browser.psml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/css/portal-standard.css
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/jetspeed/css/styles.css
    portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml
    portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
    portals/jetspeed-2/portal/trunk/pom.xml

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml?rev=774174&r1=774173&r2=774174&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml Wed
May 13 02:51:18 2009
@@ -615,6 +615,13 @@
                       <infuse>true</infuse>
                       <delete>./webcontent</delete>
                     </deployment>
+                    <deployment>
+                      <artifact>org.apache.portals.applications:apa-dbbrowser-war:war</artifact>
+                      <targetName>dbbrowser.war</targetName>
+                      <infuse>true</infuse>
+                      <delete>./dbbrowser</delete>
+                    </deployment>
+
                     <!-- logging -->
                     <deployment>
                       <artifact>org.apache.portals.applications:apa-logging:jar</artifact>
@@ -709,6 +716,12 @@
                 <version>${org.apache.portals.applications.apa-webcontent.version}</version>
                 <type>war</type>
               </dependency>
+              <dependency>
+                <groupId>org.apache.portals.applications</groupId>
+                <artifactId>apa-dbbrowser-war</artifactId>
+                <version>${org.apache.portals.applications.apa-dbbrowser.version}</version>
+                <type>war</type>
+              </dependency>
               <!-- logging -->
               <dependency>
                 <groupId>org.apache.portals.applications</groupId>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Public/db-browser.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Public/db-browser.psml?rev=774174&r1=774173&r2=774174&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Public/db-browser.psml
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/Public/db-browser.psml
Wed May 13 02:51:18 2009
@@ -27,8 +27,12 @@
   <metadata name="title" xml:lang="zh-TW">DB流覽器示例</metadata>
   <metadata name="title" xml:lang="ko">DB 브라우저 데모</metadata>
 
-  <fragment id="dbb-1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
-     <fragment id="dbb-101" type="portlet" name="dbbrowser::DbBrowserExample">
+  <fragment id="dbb-10" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+     <fragment id="dbb-1000" type="portlet" name="dbbrowser::CitiesDatabase">
+      <property layout="TwoColumns" name="row" value="1" />
+      <property layout="TwoColumns" name="column" value="0" />
+     </fragment>
+     <fragment id="dbb-1001" type="portlet" name="dbbrowser::CountriesDatabase">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="0" />
      </fragment>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/css/portal-standard.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/css/portal-standard.css?rev=774174&r1=774173&r2=774174&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/css/portal-standard.css
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/layout/css/portal-standard.css
Wed May 13 02:51:18 2009
@@ -22,5 +22,3 @@
 @import url("./standard-columns.css");
 @import url("./html-tables.css");
 @import url("./data-scroller.css");
-@import url("./database-browser.css");
-@import url("./tree-component.css");
\ No newline at end of file

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/jetspeed/css/styles.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/jetspeed/css/styles.css?rev=774174&r1=774173&r2=774174&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/jetspeed/css/styles.css
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/jetspeed/css/styles.css
Wed May 13 02:51:18 2009
@@ -219,7 +219,7 @@
 }
 
 .jetspeed .portlet-section-alternate {
-    background: none;
+    background: #eeeeff;
     border-bottom:1px solid #dedede;
     padding:2px;
     text-align: left;

Modified: portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml?rev=774174&r1=774173&r2=774174&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/enterprise/ear-full/pom.xml Wed May 13 02:51:18 2009
@@ -56,6 +56,11 @@
       <artifactId>apa-webcontent-war</artifactId>
       <type>war</type>
     </dependency>
+    <dependency>
+      <groupId>org.apache.portals.applications</groupId>
+      <artifactId>apa-dbbrowser-war</artifactId>
+      <type>war</type>
+    </dependency>
   </dependencies>
 
   <!-- POM build -->
@@ -93,6 +98,11 @@
               <artifactId>apa-webcontent-war</artifactId>
               <contextRoot>/webcontent</contextRoot>
             </webModule>                       
+            <webModule>
+              <groupId>org.apache.portals.applications</groupId>
+              <artifactId>apa-dbbrowser-war</artifactId>
+              <contextRoot>/dbbrowser</contextRoot>
+            </webModule>                       
 
             <!-- skinny wars classpath lib jars -->
             <jarModule>
@@ -202,6 +212,11 @@
                     <attribute name="Class-Path" value="${war.manifest.classpath}"/>
                   </manifest>
                 </jar>
+                <jar destfile="${project.build.directory}/package-skinny-wars/apa-dbbrowser-war-${org.apache.portals.applications.apa-dbbrowser.version}.war"
update="true">
+                  <manifest>
+                    <attribute name="Class-Path" value="${war.manifest.classpath}"/>
+                  </manifest>
+                </jar>
                 
                 <!-- Offline deployment infusion of generic APA wars for Jetspeed-2 -->
                 <java classname="org.apache.jetspeed.tools.deploy.JetspeedDeploy">
@@ -219,6 +234,11 @@
                    <arg value="${project.build.directory}/package-skinny-wars/apa-webcontent-war-${org.apache.portals.applications.apa-webcontent.version}.war"/>
                    <arg value="webcontent"/>
                 </java>
+                <java classname="org.apache.jetspeed.tools.deploy.JetspeedDeploy">
+                   <arg value="${project.build.directory}/package-skinny-wars/apa-dbbrowser-war-${org.apache.portals.applications.apa-dbbrowser.version}.war"/>
+                   <arg value="${project.build.directory}/package-skinny-wars/apa-dbbrowser-war-${org.apache.portals.applications.apa-dbbrowser.version}.war"/>
+                   <arg value="webcontent"/>
+                </java>
                 
                 <!-- repackage EAR with skinny wars -->
                 <jar destfile="${project.build.directory}/${project.build.finalName}.ear"
basedir="${project.build.directory}/package-skinny-wars" manifest="${project.build.directory}/package-skinny-wars/META-INF/MANIFEST.MF"/>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml?rev=774174&r1=774173&r2=774174&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
Wed May 13 02:51:18 2009
@@ -392,6 +392,12 @@
                       <infuse>true</infuse>
                       <delete>./webcontent</delete>
                     </deployment>
+             		<deployment>
+                      <artifact>org.apache.portals.applications:apa-dbbrowser-war:war</artifact>
+                      <targetName>dbbrowser.war</targetName>
+                      <infuse>true</infuse>
+                      <delete>./dbbrowser</delete>
+                    </deployment>                    
                     <!-- logging -->
                     <deployment>
                       <artifact>org.apache.portals.applications:apa-logging:jar</artifact>

Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=774174&r1=774173&r2=774174&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Wed May 13 02:51:18 2009
@@ -318,6 +318,8 @@
     <org.apache.portals.applications.apa-logging.version>1.0-SNAPSHOT</org.apache.portals.applications.apa-logging.version>
     <org.apache.portals.applications.apa-rss.version>1.0-SNAPSHOT</org.apache.portals.applications.apa-rss.version>
     <org.apache.portals.applications.apa-webcontent.version>1.0-SNAPSHOT</org.apache.portals.applications.apa-webcontent.version>
+    <org.apache.portals.applications.apa-dbbrowser.version>1.0-SNAPSHOT</org.apache.portals.applications.apa-dbbrowser.version>
+
     <oro.version>2.0.8</oro.version>
     <portals.portlet2-api-spec.version>1.0</portals.portlet2-api-spec.version>
     <regexp.version>1.2</regexp.version>
@@ -564,6 +566,12 @@
         <type>war</type>
         <version>${org.apache.portals.applications.apa-webcontent.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.portals.applications</groupId>
+        <artifactId>apa-dbbrowser-war</artifactId>
+        <type>war</type>
+        <version>${org.apache.portals.applications.apa-dbbrowser.version}</version>
+      </dependency>
 
       <!-- Standard APIs -->
       <dependency>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message