ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1200034 - in /webservices/commons/trunk/modules/axiom: modules/axiom-buildutils/pom.xml modules/axiom-buildutils/src/main/java/org/apache/axiom/buildutils/OhlohMacro.java pom.xml src/site/apt/index.apt src/site/resources/css/site.css
Date Wed, 09 Nov 2011 23:20:57 GMT
Author: veithen
Date: Wed Nov  9 23:20:57 2011
New Revision: 1200034

URL: http://svn.apache.org/viewvc?rev=1200034&view=rev
Log:
Added an Ohloh widget to the home page.

Added:
    webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/src/main/java/org/apache/axiom/buildutils/OhlohMacro.java
  (with props)
Modified:
    webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/pom.xml
    webservices/commons/trunk/modules/axiom/pom.xml
    webservices/commons/trunk/modules/axiom/src/site/apt/index.apt
    webservices/commons/trunk/modules/axiom/src/site/resources/css/site.css

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/pom.xml?rev=1200034&r1=1200033&r2=1200034&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/pom.xml Wed Nov  9 23:20:57
2011
@@ -46,5 +46,27 @@
             <!-- This avoids conflicts with our patched version of the plugin -->
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven.doxia</groupId>
+            <artifactId>doxia-core</artifactId>
+            <version>1.1.3</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-maven-plugin</artifactId>
+                <version>1.3.8</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>descriptor</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Added: webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/src/main/java/org/apache/axiom/buildutils/OhlohMacro.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/src/main/java/org/apache/axiom/buildutils/OhlohMacro.java?rev=1200034&view=auto
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/src/main/java/org/apache/axiom/buildutils/OhlohMacro.java
(added)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/src/main/java/org/apache/axiom/buildutils/OhlohMacro.java
Wed Nov  9 23:20:57 2011
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+package org.apache.axiom.buildutils;
+
+import org.apache.maven.doxia.macro.AbstractMacro;
+import org.apache.maven.doxia.macro.MacroExecutionException;
+import org.apache.maven.doxia.macro.MacroRequest;
+import org.apache.maven.doxia.sink.Sink;
+
+/**
+ * Doxia macro to insert Ohloh widgets.
+ * 
+ * @plexus.component role="org.apache.maven.doxia.macro.Macro" role-hint="ohloh"
+ */
+public class OhlohMacro extends AbstractMacro {
+    public void execute(Sink sink, MacroRequest request) throws MacroExecutionException {
+        String project = (String)request.getParameter("project");
+        if (project == null) {
+            throw new MacroExecutionException("'project' macro parameter is required");
+        }
+        String widget = (String)request.getParameter("widget");
+        if (widget == null) {
+            throw new MacroExecutionException("'widget' macro parameter is required");
+        }
+        sink.rawText("<div style=\"float: left; border: 1px dotted #777777; background-color:
white\"><script type=\"text/javascript\" src=\"http://www.ohloh.net/p/"
+                + project + "/widgets/project_" + widget + ".js\"></script></div><div
style=\"clear: both\"/>");
+    }
+}

Propchange: webservices/commons/trunk/modules/axiom/modules/axiom-buildutils/src/main/java/org/apache/axiom/buildutils/OhlohMacro.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/commons/trunk/modules/axiom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/pom.xml?rev=1200034&r1=1200033&r2=1200034&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/pom.xml Wed Nov  9 23:20:57 2011
@@ -258,6 +258,13 @@
                 <plugin>
                     <artifactId>maven-site-plugin</artifactId>
                     <version>2.1.1</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>axiom-buildutils</artifactId>
+                            <version>${project.version}</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
             </plugins>
         </pluginManagement>

Modified: webservices/commons/trunk/modules/axiom/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/site/apt/index.apt?rev=1200034&r1=1200033&r2=1200034&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/site/apt/index.apt (original)
+++ webservices/commons/trunk/modules/axiom/src/site/apt/index.apt Wed Nov  9 23:20:57 2011
@@ -35,6 +35,8 @@ Welcome to Apache Axiom
   Apache Axiom, Axiom, Apache, the Apache feather logo, and the Apache Axiom project logo
are
   trademarks of {{{http://apache.org/}The Apache Software Foundation}}.
   
+%{ohloh|project=6368|widget=basic_stats}
+  
 Key Features
 
     * Full XML Infoset compliant XML object model

Modified: webservices/commons/trunk/modules/axiom/src/site/resources/css/site.css
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/site/resources/css/site.css?rev=1200034&r1=1200033&r2=1200034&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/site/resources/css/site.css (original)
+++ webservices/commons/trunk/modules/axiom/src/site/resources/css/site.css Wed Nov  9 23:20:57
2011
@@ -59,7 +59,6 @@ div#breadcrumbs a:hover {
 div#leftColumn {
   background-color: #DCE3EB;
   border: none;
-  overflow: visible;
 }
 
 div#navcolumn > ul > li.expanded,
@@ -89,6 +88,10 @@ div#navcolumn li.expanded > a {
   border-bottom: 1px solid #999999;
 }
 
+div#contentBox {
+  float: left;
+}
+
 div#contentBox > div.section {
   border-top: 1px solid #999999;
   margin-top: 1.5em;



Mime
View raw message