svn commit: r1051818 - in /directory/skins/trunk: apacheds-skin/ apacheds-skin/src/main/resources/META-INF/ apacheds-skin/src/main/resources/css/ apacheds-skin/src/main/resources/images/ apacheds-skin/src/main/resources/images/logos/ common-resources/ ...

[se...@apache.org]

Author: seelmann
Date: Wed Dec 22 10:41:14 2010
New Revision: 1051818

URL: http://svn.apache.org/viewvc?rev=1051818&view=rev
Log:
o moved common resources to common-resources
o added second resource to apacheds-skin to copy common resources
o renamed project-specific css (green.css) to generic name (project.css) in order to reuse velocity template


Added:
    directory/skins/trunk/apacheds-skin/src/main/resources/css/project.css
      - copied unchanged from r1051790, directory/skins/trunk/apacheds-skin/src/main/resources/css/green.css
    directory/skins/trunk/common-resources/
    directory/skins/trunk/common-resources/META-INF/
      - copied from r1051790, directory/skins/trunk/apacheds-skin/src/main/resources/META-INF/
    directory/skins/trunk/common-resources/css/
      - copied from r1051790, directory/skins/trunk/apacheds-skin/src/main/resources/css/
    directory/skins/trunk/common-resources/images/
      - copied from r1051790, directory/skins/trunk/apacheds-skin/src/main/resources/images/
Removed:
    directory/skins/trunk/apacheds-skin/src/main/resources/META-INF/
    directory/skins/trunk/apacheds-skin/src/main/resources/css/common.css
    directory/skins/trunk/apacheds-skin/src/main/resources/css/green.css
    directory/skins/trunk/apacheds-skin/src/main/resources/css/print.css
    directory/skins/trunk/apacheds-skin/src/main/resources/css/reporting.css
    directory/skins/trunk/apacheds-skin/src/main/resources/images/body-bg.png
    directory/skins/trunk/apacheds-skin/src/main/resources/images/collapsed.gif
    directory/skins/trunk/apacheds-skin/src/main/resources/images/content-background.png
    directory/skins/trunk/apacheds-skin/src/main/resources/images/edit_out.png
    directory/skins/trunk/apacheds-skin/src/main/resources/images/edit_over.png
    directory/skins/trunk/apacheds-skin/src/main/resources/images/expanded.gif
    directory/skins/trunk/apacheds-skin/src/main/resources/images/external.png
    directory/skins/trunk/apacheds-skin/src/main/resources/images/footer.png
    directory/skins/trunk/apacheds-skin/src/main/resources/images/icon_error_sml.gif
    directory/skins/trunk/apacheds-skin/src/main/resources/images/icon_info_sml.gif
    directory/skins/trunk/apacheds-skin/src/main/resources/images/icon_success_sml.gif
    directory/skins/trunk/apacheds-skin/src/main/resources/images/icon_warning_sml.gif
    directory/skins/trunk/apacheds-skin/src/main/resources/images/logos/
    directory/skins/trunk/apacheds-skin/src/main/resources/images/news-blue.png
    directory/skins/trunk/apacheds-skin/src/main/resources/images/newwindow.png
    directory/skins/trunk/apacheds-skin/src/main/resources/images/post-blue.png
    directory/skins/trunk/common-resources/css/green.css
    directory/skins/trunk/common-resources/images/header-green.png
    directory/skins/trunk/common-resources/images/news-blue.png
    directory/skins/trunk/common-resources/images/news-green.png
    directory/skins/trunk/common-resources/images/post-blue.png
    directory/skins/trunk/common-resources/images/post-green.png
    directory/skins/trunk/common-resources/images/server-icon_128x128.png
    directory/skins/trunk/common-resources/images/server-icon_16x16.png
Modified:
    directory/skins/trunk/apacheds-skin/pom.xml
    directory/skins/trunk/common-resources/META-INF/maven/site.vm

Modified: directory/skins/trunk/apacheds-skin/pom.xml
URL: http://svn.apache.org/viewvc/directory/skins/trunk/apacheds-skin/pom.xml?rev=1051818&r1=1051817&r2=1051818&view=diff
==============================================================================
--- directory/skins/trunk/apacheds-skin/pom.xml (original)
+++ directory/skins/trunk/apacheds-skin/pom.xml Wed Dec 22 10:41:14 2010
@@ -32,5 +32,16 @@ under the License.
   <name>Directory Skin</name>
   <description>Apache Directory Skin used by the ApacheDS and general projects.</description>
 
+  <build>
+    <resources>
+      <resource>
+        <directory>../common-resources/</directory>
+      </resource>
+      <resource>
+        <directory>src/main/resources/</directory>
+      </resource>
+    </resources>
+  </build>
+
 </project>
 

Modified: directory/skins/trunk/common-resources/META-INF/maven/site.vm
URL: http://svn.apache.org/viewvc/directory/skins/trunk/common-resources/META-INF/maven/site.vm?rev=1051818&r1=1051790&r2=1051818&view=diff
==============================================================================
--- directory/skins/trunk/common-resources/META-INF/maven/site.vm (original)
+++ directory/skins/trunk/common-resources/META-INF/maven/site.vm Wed Dec 22 10:41:14 2010
@@ -452,7 +452,7 @@
     <title>$title</title>
     <style type="text/css" media="all">
       @import url("$relativePath/css/common.css");
-      @import url("$relativePath/css/green.css");
+      @import url("$relativePath/css/project.css");
       @import url("$relativePath/css/reporting.css");
     </style>
     <link rel="stylesheet" href="$relativePath/css/print.css" type="text/css" media="print" />