felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r927780 - in /felix/trunk/webconsole: ./ src/main/compat/ src/main/compat/res/ src/main/compat/res/imgs/ src/main/compat/res/ui/ src/main/resources/res/ui/
Date Fri, 26 Mar 2010 11:38:35 GMT
Author: fmeschbe
Date: Fri Mar 26 11:38:34 2010
New Revision: 927780

URL: http://svn.apache.org/viewvc?rev=927780&view=rev
Log:
FELIX-2238 create a src/main/compat folder to place the resources kept for backwards compatibility.
This will take the icons once removed in Rev. 922641 and the admin_compat.css file created
in Rev. 922227

Added:
    felix/trunk/webconsole/LICENSE.silk
      - copied unchanged from r922613, felix/trunk/webconsole/LICENSE.silk
    felix/trunk/webconsole/src/main/compat/
    felix/trunk/webconsole/src/main/compat/res/
    felix/trunk/webconsole/src/main/compat/res/imgs/
    felix/trunk/webconsole/src/main/compat/res/imgs/arrow_down.png
      - copied unchanged from r922613, felix/trunk/webconsole/src/main/resources/res/imgs/arrow_down.png
    felix/trunk/webconsole/src/main/compat/res/imgs/arrow_left.png
      - copied unchanged from r922613, felix/trunk/webconsole/src/main/resources/res/imgs/arrow_left.png
    felix/trunk/webconsole/src/main/compat/res/imgs/arrow_right.png
      - copied unchanged from r922613, felix/trunk/webconsole/src/main/resources/res/imgs/arrow_right.png
    felix/trunk/webconsole/src/main/compat/res/imgs/asc.gif
      - copied unchanged from r922613, felix/trunk/webconsole/src/main/resources/res/imgs/asc.gif
    felix/trunk/webconsole/src/main/compat/res/imgs/bg.gif
      - copied unchanged from r922613, felix/trunk/webconsole/src/main/resources/res/imgs/bg.gif
    felix/trunk/webconsole/src/main/compat/res/imgs/bundle_delete.png
      - copied unchanged from r922613, felix/trunk/webconsole/src/main/resources/res/imgs/bundle_delete.png
    felix/trunk/webconsole/src/main/compat/res/imgs/bundle_refresh.png
      - copied unchanged from r922613, felix/trunk/webconsole/src/main/resources/res/imgs/bundle_refresh.png
    felix/trunk/webconsole/src/main/compat/res/imgs/bundle_start.png
      - copied unchanged from r922613, felix/trunk/webconsole/src/main/resources/res/imgs/bundle_start.png
    felix/trunk/webconsole/src/main/compat/res/imgs/bundle_stop.png
      - copied unchanged from r922613, felix/trunk/webconsole/src/main/resources/res/imgs/bundle_stop.png
    felix/trunk/webconsole/src/main/compat/res/imgs/bundle_update.png
      - copied unchanged from r922613, felix/trunk/webconsole/src/main/resources/res/imgs/bundle_update.png
    felix/trunk/webconsole/src/main/compat/res/imgs/component_configure.png
      - copied unchanged from r922613, felix/trunk/webconsole/src/main/resources/res/imgs/component_configure.png
    felix/trunk/webconsole/src/main/compat/res/imgs/component_disable.png
      - copied unchanged from r922613, felix/trunk/webconsole/src/main/resources/res/imgs/component_disable.png
    felix/trunk/webconsole/src/main/compat/res/imgs/component_enable.png
      - copied unchanged from r922613, felix/trunk/webconsole/src/main/resources/res/imgs/component_enable.png
    felix/trunk/webconsole/src/main/compat/res/imgs/desc.gif
      - copied unchanged from r922613, felix/trunk/webconsole/src/main/resources/res/imgs/desc.gif
    felix/trunk/webconsole/src/main/compat/res/imgs/down.gif
      - copied unchanged from r922613, felix/trunk/webconsole/src/main/resources/res/imgs/down.gif
    felix/trunk/webconsole/src/main/compat/res/imgs/element_add.png
      - copied unchanged from r922613, felix/trunk/webconsole/src/main/resources/res/imgs/element_add.png
    felix/trunk/webconsole/src/main/compat/res/imgs/element_delete.png
      - copied unchanged from r922613, felix/trunk/webconsole/src/main/resources/res/imgs/element_delete.png
    felix/trunk/webconsole/src/main/compat/res/imgs/element_run.png
      - copied unchanged from r922613, felix/trunk/webconsole/src/main/resources/res/imgs/element_run.png
    felix/trunk/webconsole/src/main/compat/res/imgs/element_stop.png
      - copied unchanged from r922613, felix/trunk/webconsole/src/main/resources/res/imgs/element_stop.png
    felix/trunk/webconsole/src/main/compat/res/imgs/left.gif
      - copied unchanged from r922613, felix/trunk/webconsole/src/main/resources/res/imgs/left.gif
    felix/trunk/webconsole/src/main/compat/res/imgs/right.gif
      - copied unchanged from r922613, felix/trunk/webconsole/src/main/resources/res/imgs/right.gif
    felix/trunk/webconsole/src/main/compat/res/ui/
    felix/trunk/webconsole/src/main/compat/res/ui/admin_compat.css
      - copied unchanged from r927747, felix/trunk/webconsole/src/main/resources/res/ui/admin_compat.css
Removed:
    felix/trunk/webconsole/src/main/resources/res/ui/admin_compat.css
Modified:
    felix/trunk/webconsole/NOTICE
    felix/trunk/webconsole/pom.xml

Modified: felix/trunk/webconsole/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/NOTICE?rev=927780&r1=927779&r2=927780&view=diff
==============================================================================
--- felix/trunk/webconsole/NOTICE (original)
+++ felix/trunk/webconsole/NOTICE Fri Mar 26 11:38:34 2010
@@ -33,6 +33,11 @@ This product includes software from http
 Copyright (c) 2008 Fyneworks.com
 Licensed under the MIT License
 
+This product includes icons from the Silk Icon set
+(http://www.famfamfam.com/lab/icons/silk/)
+Copyright (c) 2006 Mark James
+Licensed under the Creative Commons Attribution 2.5 License
+
 This product includes software from http://code.google.com/p/cookies/
 Copyright (c) 2005 - 2009, James Auldridge
 Licensed under the MIT License

Modified: felix/trunk/webconsole/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/pom.xml?rev=927780&r1=927779&r2=927780&view=diff
==============================================================================
--- felix/trunk/webconsole/pom.xml (original)
+++ felix/trunk/webconsole/pom.xml Fri Mar 26 11:38:34 2010
@@ -44,6 +44,24 @@
     </scm>
 
     <build>
+        <resources>
+            <!-- default resources (may be removed when compat is removed) -->
+            <resource>
+                <directory>${basedir}/src/main/resources</directory>
+            </resource>
+            <resource>
+                <targetPath>META-INF</targetPath>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>LICENSE*</include>
+                    <include>NOTICE*</include>
+                </includes>
+            </resource>
+            <!-- CSS and images for backwards compatibility -->
+            <resource>
+                <directory>${basedir}/src/main/compat</directory>
+            </resource>
+        </resources>
         <plugins>
             <!-- translate UTF-8 encoded properties files to ISO-8859-1 -->
             <plugin>



Mime
View raw message