You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/08/21 01:45:00 UTC
svn commit: r987676 - in /pivot/trunk: ./ charts/ core/ web-server/ web/
wtk-terra/ wtk-terra/src/org/apache/pivot/wtk/skin/terra/ wtk/
Author: gbrown
Date: Fri Aug 20 23:45:00 2010
New Revision: 987676
URL: http://svn.apache.org/viewvc?rev=987676&view=rev
Log:
Resolve PIVOT-601; add initial pass at WinXP and OS X color schemes.
Added:
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme_osx.json
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme_winxp.json
Modified:
pivot/trunk/build.xml
pivot/trunk/charts/pom.xml
pivot/trunk/core/pom.xml
pivot/trunk/deployment-example.xml
pivot/trunk/pom.xml
pivot/trunk/web-server/pom.xml
pivot/trunk/web/pom.xml
pivot/trunk/wtk-terra/pom.xml
pivot/trunk/wtk/pom.xml
Modified: pivot/trunk/build.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/build.xml?rev=987676&r1=987675&r2=987676&view=diff
==============================================================================
--- pivot/trunk/build.xml (original)
+++ pivot/trunk/build.xml Fri Aug 20 23:45:00 2010
@@ -648,33 +648,46 @@ limitations under the License.
<!-- Installs JARs to local Maven repository -->
<target name="maven-install" depends="clean, package, package-sources">
- <artifact:install file="pom.xml">
+ <mkdir dir="maven-install"/>
+
+ <copy todir="maven-install">
+ <fileset dir=".">
+ <include name="**/pom.xml"/>
+ </fileset>
+ <filterset>
+ <filter token="VERSION" value="${version}"/>
+ </filterset>
+ </copy>
+
+ <artifact:install file="maven-install/pom.xml">
<artifact:pom file="pom.xml"/>
</artifact:install>
<artifact:install file="lib/${jar.core}">
- <artifact:pom file="core/pom.xml"/>
+ <artifact:pom file="maven-install/core/pom.xml"/>
<attach file="lib/${jar.core.sources}" classifier="sources" />
</artifact:install>
<artifact:install file="lib/${jar.web}">
- <artifact:pom file="web/pom.xml"/>
+ <artifact:pom file="maven-install/web/pom.xml"/>
<attach file="lib/${jar.web.sources}" classifier="sources" />
</artifact:install>
<artifact:install file="lib/${jar.web-server}">
- <artifact:pom file="web/pom.xml"/>
+ <artifact:pom file="maven-install/web-server/pom.xml"/>
<attach file="lib/${jar.web-server.sources}" classifier="sources" />
</artifact:install>
<artifact:install file="lib/${jar.wtk}">
- <artifact:pom file="wtk/pom.xml"/>
+ <artifact:pom file="maven-install/wtk/pom.xml"/>
<attach file="lib/${jar.wtk.sources}" classifier="sources" />
</artifact:install>
<artifact:install file="lib/${jar.wtk-terra}">
- <artifact:pom file="wtk-terra/pom.xml"/>
+ <artifact:pom file="maven-install/wtk-terra/pom.xml"/>
<attach file="lib/${jar.wtk-terra.sources}" classifier="sources" />
</artifact:install>
<artifact:install file="lib/${jar.charts}">
- <artifact:pom file="charts/pom.xml"/>
+ <artifact:pom file="maven-install/charts/pom.xml"/>
<attach file="lib/${jar.charts.sources}" classifier="sources" />
</artifact:install>
+
+ <delete dir="maven-install"/>
</target>
<!-- Remove trailing white space in all source files -->
Modified: pivot/trunk/charts/pom.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/charts/pom.xml?rev=987676&r1=987675&r2=987676&view=diff
==============================================================================
--- pivot/trunk/charts/pom.xml (original)
+++ pivot/trunk/charts/pom.xml Fri Aug 20 23:45:00 2010
@@ -23,10 +23,10 @@ limitations under the License.
<parent>
<groupId>org.apache.pivot</groupId>
<artifactId>pivot</artifactId>
- <version>${version}</version>
+ <version>@VERSION@</version>
</parent>
<artifactId>pivot-charts</artifactId>
- <version>${version}</version>
+ <version>@VERSION@</version>
<packaging>jar</packaging>
<name>Apache Pivot Charts</name>
<description>Apache Pivot Charts</description>
@@ -34,7 +34,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.pivot</groupId>
<artifactId>pivot-wtk</artifactId>
- <version>${version}</version>
+ <version>@VERSION@</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: pivot/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/core/pom.xml?rev=987676&r1=987675&r2=987676&view=diff
==============================================================================
--- pivot/trunk/core/pom.xml (original)
+++ pivot/trunk/core/pom.xml Fri Aug 20 23:45:00 2010
@@ -23,10 +23,10 @@ limitations under the License.
<parent>
<groupId>org.apache.pivot</groupId>
<artifactId>pivot</artifactId>
- <version>${version}</version>
+ <version>@VERSION@</version>
</parent>
<artifactId>pivot-core</artifactId>
- <version>${version}</version>
+ <version>@VERSION@</version>
<packaging>jar</packaging>
<name>Apache Pivot Core</name>
<description>Apache Pivot Core Library</description>
Modified: pivot/trunk/deployment-example.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/deployment-example.xml?rev=987676&r1=987675&r2=987676&view=diff
==============================================================================
--- pivot/trunk/deployment-example.xml (original)
+++ pivot/trunk/deployment-example.xml Fri Aug 20 23:45:00 2010
@@ -160,7 +160,9 @@ JarBundler requires Mac OS X. See the pr
outfile="${example.exe}">
<classPath mainClass="org.apache.pivot.wtk.DesktopApplicationContext"
cp="${folder.lib}/pivot-core-${version}.jar;${folder.lib}/pivot-wtk-${version}.jar;${folder.lib}/pivot-wtk-terra-${version}.jar"/>
- <jre minVersion="1.6.0"/>
+ <jre minVersion="1.6.0">
+ <opt>-Dorg.apache.pivot.wtk.skin.terra.location=TerraTheme_winxp.json</opt>
+ </jre>
</config>
</launch4j>
@@ -184,6 +186,7 @@ JarBundler requires Mac OS X. See the pr
name="${example.name}"
mainclass="org.apache.pivot.wtk.DesktopApplicationContext"
arguments="org.apache.pivot.examples.deployment.DeploymentExample"
+ vmoptions="-Dorg.apache.pivot.wtk.skin.terra.location=TerraTheme_osx.json"
icon="${ant.project.name}/${folder.src}/${example.path}/logo-notext-256x256.icns">
<jarfileset dir="${folder.lib}">
<include name="${example.jar}"/>
Modified: pivot/trunk/pom.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/pom.xml?rev=987676&r1=987675&r2=987676&view=diff
==============================================================================
--- pivot/trunk/pom.xml (original)
+++ pivot/trunk/pom.xml Fri Aug 20 23:45:00 2010
@@ -23,7 +23,7 @@ limitations under the License.
<groupId>org.apache.pivot</groupId>
<artifactId>pivot</artifactId>
<packaging>pom</packaging>
- <version>${version}</version>
+ <version>@VERSION@</version>
<organization>
<name>Apache Software Foundation</name>
<url>http://www.apache.org</url>
Modified: pivot/trunk/web-server/pom.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/web-server/pom.xml?rev=987676&r1=987675&r2=987676&view=diff
==============================================================================
--- pivot/trunk/web-server/pom.xml (original)
+++ pivot/trunk/web-server/pom.xml Fri Aug 20 23:45:00 2010
@@ -23,10 +23,10 @@ limitations under the License.
<parent>
<groupId>org.apache.pivot</groupId>
<artifactId>pivot</artifactId>
- <version>${version}</version>
+ <version>@VERSION@</version>
</parent>
<artifactId>pivot-web-server</artifactId>
- <version>${version}</version>
+ <version>@VERSION@</version>
<packaging>jar</packaging>
<name>Apache Pivot Web Server</name>
<description>Apache Pivot Web Server Library</description>
@@ -34,12 +34,12 @@ limitations under the License.
<dependency>
<groupId>org.apache.pivot</groupId>
<artifactId>pivot-core</artifactId>
- <version>${version}</version>
+ <version>@VERSION@</version>
</dependency>
<dependency>
<groupId>org.apache.pivot</groupId>
<artifactId>pivot-web</artifactId>
- <version>${version}</version>
+ <version>@VERSION@</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: pivot/trunk/web/pom.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/web/pom.xml?rev=987676&r1=987675&r2=987676&view=diff
==============================================================================
--- pivot/trunk/web/pom.xml (original)
+++ pivot/trunk/web/pom.xml Fri Aug 20 23:45:00 2010
@@ -23,10 +23,10 @@ limitations under the License.
<parent>
<groupId>org.apache.pivot</groupId>
<artifactId>pivot</artifactId>
- <version>${version}</version>
+ <version>@VERSION@</version>
</parent>
<artifactId>pivot-web</artifactId>
- <version>${version}</version>
+ <version>@VERSION@</version>
<packaging>jar</packaging>
<name>Apache Pivot Web</name>
<description>Apache Pivot Web Library</description>
@@ -34,7 +34,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.pivot</groupId>
<artifactId>pivot-core</artifactId>
- <version>${version}</version>
+ <version>@VERSION@</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: pivot/trunk/wtk-terra/pom.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/pom.xml?rev=987676&r1=987675&r2=987676&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/pom.xml (original)
+++ pivot/trunk/wtk-terra/pom.xml Fri Aug 20 23:45:00 2010
@@ -23,10 +23,10 @@ limitations under the License.
<parent>
<groupId>org.apache.pivot</groupId>
<artifactId>pivot</artifactId>
- <version>${version}</version>
+ <version>@VERSION@</version>
</parent>
<artifactId>pivot-wtk-terra</artifactId>
- <version>${version}</version>
+ <version>@VERSION@</version>
<packaging>jar</packaging>
<name>Apache Pivot WTK Terra Theme</name>
<description>Apache Pivot WTK Terra Theme Library</description>
@@ -34,7 +34,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.pivot</groupId>
<artifactId>pivot-wtk</artifactId>
- <version>${version}</version>
+ <version>@VERSION@</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Added: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme_osx.json
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme_osx.json?rev=987676&view=auto
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme_osx.json (added)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme_osx.json Fri Aug 20 23:45:00 2010
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+{ font: "Verdana 11",
+
+ colors: [
+ "#000000",
+ "#ffffff",
+ "#919191",
+ "#dadada",
+ "#2f5aa5",
+ "#616161",
+ "#ffe480",
+ "#eb0000"
+ ],
+
+ messageIcons: {
+ error: "message_type-error-32x32.png",
+ warning: "message_type-warning-32x32.png",
+ question: "message_type-question-32x32.png",
+ info: "message_type-info-32x32.png"
+ },
+
+ smallMessageIcons: {
+ error: "message_type-error-16x16.png",
+ warning: "message_type-warning-16x16.png",
+ question: "message_type-question-16x16.png",
+ info: "message_type-info-16x16.png"
+ }
+}
Added: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme_winxp.json
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme_winxp.json?rev=987676&view=auto
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme_winxp.json (added)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTheme_winxp.json Fri Aug 20 23:45:00 2010
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+{ font: "Verdana 11",
+
+ colors: [
+ "#000000",
+ "#ffffff",
+ "#999999",
+ "#f0f0ea",
+ "#2f64b9",
+ "#1a961a",
+ "#ffe480",
+ "#eb0000"
+ ],
+
+ messageIcons: {
+ error: "message_type-error-32x32.png",
+ warning: "message_type-warning-32x32.png",
+ question: "message_type-question-32x32.png",
+ info: "message_type-info-32x32.png"
+ },
+
+ smallMessageIcons: {
+ error: "message_type-error-16x16.png",
+ warning: "message_type-warning-16x16.png",
+ question: "message_type-question-16x16.png",
+ info: "message_type-info-16x16.png"
+ }
+}
Modified: pivot/trunk/wtk/pom.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/pom.xml?rev=987676&r1=987675&r2=987676&view=diff
==============================================================================
--- pivot/trunk/wtk/pom.xml (original)
+++ pivot/trunk/wtk/pom.xml Fri Aug 20 23:45:00 2010
@@ -23,10 +23,10 @@ limitations under the License.
<parent>
<groupId>org.apache.pivot</groupId>
<artifactId>pivot</artifactId>
- <version>${version}</version>
+ <version>@VERSION@</version>
</parent>
<artifactId>pivot-wtk</artifactId>
- <version>${version}</version>
+ <version>@VERSION@</version>
<packaging>jar</packaging>
<name>Apache Pivot WTK</name>
<description>Apache Pivot WTK Library</description>
@@ -34,7 +34,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.pivot</groupId>
<artifactId>pivot-core</artifactId>
- <version>${version}</version>
+ <version>@VERSION@</version>
</dependency>
</dependencies>
</project>