Author: solomax
Date: Wed Sep 17 11:47:05 2014
New Revision: 1625526

URL: http://svn.apache.org/r1625526
Log:
Site structure is updated to display more modules

Added:
    openmeetings/trunk/singlewebapp/src/
    openmeetings/trunk/singlewebapp/src/site/
    openmeetings/trunk/singlewebapp/src/site/resources/
    openmeetings/trunk/singlewebapp/src/site/resources/site.xml
    openmeetings/trunk/singlewebapp/src/site/site.xml
Modified:
    openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-core/src/   (props changed)
    openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-db/src/   (props changed)
    openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-flash/src/   (props changed)
    openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-install/src/   (props changed)
    openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/   (props 
changed)
    openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml
    
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/all.xml
    openmeetings/trunk/singlewebapp/openmeetings-server/src/site/site.xml
    openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-service/src/   (props changed)
    openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-util/src/   (props changed)
    openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/   (props changed)
    openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-webservice/src/   (props 
changed)
    openmeetings/trunk/singlewebapp/pom.xml

Modified: openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml?rev=1625526&r1=1625525&r2=1625526&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml Wed Sep 17 
11:47:05 2014
@@ -30,10 +30,10 @@
        <name>Openmeetings Core</name>
        <description>TODO</description>
        <properties>
-               
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <velocity.version>1.7</velocity.version>
                <smslib.version>3.5.4</smslib.version>
                <derby.version>10.10.1.1</derby.version>
+               <site.basedir>${project.parent.basedir}</site.basedir>
        </properties>
        <repositories>
                <repository>

Propchange: openmeetings/trunk/singlewebapp/openmeetings-core/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Sep 17 11:47:05 2014
@@ -0,0 +1,2 @@
+site
+

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml?rev=1625526&r1=1625525&r2=1625526&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml Wed Sep 17 11:47:05 
2014
@@ -30,12 +30,12 @@
        <name>Openmeetings DB</name>
        <description>TODO</description>
        <properties>
-               
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <openjpa.version>2.3.0</openjpa.version>
                <asterisk-java.version>1.0.0.CI-SNAPSHOT</asterisk-java.version>
                <commons-dbcp.version>1.4</commons-dbcp.version>
                <derby.version>10.11.1.1</derby.version>
                <postgresql.version>9.3-1102-jdbc41</postgresql.version>
+               <site.basedir>${project.parent.basedir}</site.basedir>
        </properties>
        <dependencies>
                <dependency>

Propchange: openmeetings/trunk/singlewebapp/openmeetings-db/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Sep 17 11:47:05 2014
@@ -0,0 +1,2 @@
+site
+

Modified: openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml?rev=1625526&r1=1625525&r2=1625526&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml Wed Sep 17 
11:47:05 2014
@@ -34,6 +34,7 @@
                <laszlo46.home>${openlaszlo}/openlaszlo46</laszlo46.home>
                <out.dir.swf>${project.build.directory}</out.dir.swf>
                
<webcontent.base.dir>${project.basedir}/src/main</webcontent.base.dir>
+               <site.basedir>${project.parent.basedir}</site.basedir>
        </properties>
        <build>
                <!-- sourceDirectory>src/main/flex</sourceDirectory-->

Propchange: openmeetings/trunk/singlewebapp/openmeetings-flash/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Sep 17 11:47:05 2014
@@ -0,0 +1,2 @@
+site
+

Modified: openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml?rev=1625526&r1=1625525&r2=1625526&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml Wed Sep 17 
11:47:05 2014
@@ -30,8 +30,8 @@
        <name>Openmeetings Install</name>
        <description>TODO</description>
        <properties>
-               
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <commons-cli.version>1.2</commons-cli.version>
+               <site.basedir>${project.parent.basedir}</site.basedir>
        </properties>
        <dependencies>
                <dependency>

Propchange: openmeetings/trunk/singlewebapp/openmeetings-install/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Sep 17 11:47:05 2014
@@ -0,0 +1,2 @@
+site
+

Modified: openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml?rev=1625526&r1=1625525&r2=1625526&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml Wed Sep 17 
11:47:05 2014
@@ -30,12 +30,12 @@
        <name>Openmeetings Screen Sharing applet</name>
        <description>A File to grab a screen and send it to a 
Server</description>
        <properties>
-               
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                
<keystore.location>${project.build.directory}/screensharing_sign.keystore</keystore.location>
                <key.password>secret</key.password>
                <keystore.password>secret</keystore.password>
                <keystore.type>jks</keystore.type>
                <key.alias>screen</key.alias>
+               <site.basedir>${project.parent.basedir}</site.basedir>
        </properties>
        <dependencies>
                <dependency>

Propchange: openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Sep 17 11:47:05 2014
@@ -0,0 +1,2 @@
+site
+

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml?rev=1625526&r1=1625525&r2=1625526&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml Wed Sep 17 
11:47:05 2014
@@ -30,7 +30,6 @@
        <name>Openmeetings Server</name>
        <description>TODO</description>
        <properties>
-               
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <server.dir>${project.build.directory}/red5-server</server.dir>
                
<languages.dir>${project.parent.basedir}/openmeetings-web/src/main/webapp/languages</languages.dir>
                
<assembly.finalName>${project.build.finalName}</assembly.finalName>
@@ -41,6 +40,7 @@
                <om.webapp>webapps/openmeetings</om.webapp>
                <root.webapp>webapps/root</root.webapp>
                
<red5-server.file.name>red5-server-1.0.3-RELEASE-server.zip</red5-server.file.name><!--
 FIXME duplicate variable -->
+               <skip.site.copy>true</skip.site.copy>
        </properties>
        <scm>
                
<connection>scm:svn:https://svn.apache.org/repos/asf/openmeetings/trunk/singlewebapp</connection>
@@ -199,22 +199,6 @@
                        </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-site-plugin</artifactId>
-                               <configuration>
-                                       <skip>${om.quick.build}</skip>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>generate-site</id>
-                                               
<phase>generate-resources</phase>
-                                               <goals>
-                                                       <goal>site</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-assembly-plugin</artifactId>
                                <configuration>
                                        <descriptors>

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/all.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/all.xml?rev=1625526&r1=1625525&r2=1625526&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/all.xml
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/components/all.xml
 Wed Sep 17 11:47:05 2014
@@ -108,8 +108,8 @@
                        <outputDirectory>${om.webapp}/docs</outputDirectory>
                </fileSet>
                <fileSet>
-                       
<directory>${project.parent.basedir}/openmeetings-webservice/target/site/apidocs</directory><!--
 FIXME should be implemented differently -->
-                       
<outputDirectory>${om.webapp}/docs/webservices</outputDirectory>
+                       
<directory>${project.parent.basedir}/openmeetings-core/target/site</directory><!--
 FIXME should be implemented differently -->
+                       
<outputDirectory>${om.webapp}/docs/openmeetings-core</outputDirectory>
                        <excludes>
                                <exclude>javadoc.sh</exclude>
                                <exclude>options</exclude>
@@ -117,8 +117,71 @@
                        </excludes>
                </fileSet>
                <fileSet>
-                       
<directory>${project.parent.basedir}/openmeetings-db/target/site/apidocs</directory><!--
 FIXME should be implemented differently -->
-                       
<outputDirectory>${om.webapp}/docs/openmeetings-db/apidocs</outputDirectory>
+                       
<directory>${project.parent.basedir}/openmeetings-db/target/site</directory><!--
 FIXME should be implemented differently -->
+                       
<outputDirectory>${om.webapp}/docs/openmeetings-db</outputDirectory>
+                       <excludes>
+                               <exclude>javadoc.sh</exclude>
+                               <exclude>options</exclude>
+                               <exclude>packages</exclude>
+                       </excludes>
+               </fileSet>
+               <fileSet>
+                       
<directory>${project.parent.basedir}/openmeetings-flash/target/site</directory><!--
 FIXME should be implemented differently -->
+                       
<outputDirectory>${om.webapp}/docs/openmeetings-flash</outputDirectory>
+                       <excludes>
+                               <exclude>javadoc.sh</exclude>
+                               <exclude>options</exclude>
+                               <exclude>packages</exclude>
+                       </excludes>
+               </fileSet>
+               <fileSet>
+                       
<directory>${project.parent.basedir}/openmeetings-install/target/site</directory><!--
 FIXME should be implemented differently -->
+                       
<outputDirectory>${om.webapp}/docs/openmeetings-install</outputDirectory>
+                       <excludes>
+                               <exclude>javadoc.sh</exclude>
+                               <exclude>options</exclude>
+                               <exclude>packages</exclude>
+                       </excludes>
+               </fileSet>
+               <fileSet>
+                       
<directory>${project.parent.basedir}/openmeetings-screenshare/target/site</directory><!--
 FIXME should be implemented differently -->
+                       
<outputDirectory>${om.webapp}/docs/openmeetings-screenshare</outputDirectory>
+                       <excludes>
+                               <exclude>javadoc.sh</exclude>
+                               <exclude>options</exclude>
+                               <exclude>packages</exclude>
+                       </excludes>
+               </fileSet>
+               <fileSet>
+                       
<directory>${project.parent.basedir}/openmeetings-service/target/site</directory><!--
 FIXME should be implemented differently -->
+                       
<outputDirectory>${om.webapp}/docs/openmeetings-service</outputDirectory>
+                       <excludes>
+                               <exclude>javadoc.sh</exclude>
+                               <exclude>options</exclude>
+                               <exclude>packages</exclude>
+                       </excludes>
+               </fileSet>
+               <fileSet>
+                       
<directory>${project.parent.basedir}/openmeetings-util/target/site</directory><!--
 FIXME should be implemented differently -->
+                       
<outputDirectory>${om.webapp}/docs/openmeetings-util</outputDirectory>
+                       <excludes>
+                               <exclude>javadoc.sh</exclude>
+                               <exclude>options</exclude>
+                               <exclude>packages</exclude>
+                       </excludes>
+               </fileSet>
+               <fileSet>
+                       
<directory>${project.parent.basedir}/openmeetings-web/target/site</directory><!--
 FIXME should be implemented differently -->
+                       
<outputDirectory>${om.webapp}/docs/openmeetings-web</outputDirectory>
+                       <excludes>
+                               <exclude>javadoc.sh</exclude>
+                               <exclude>options</exclude>
+                               <exclude>packages</exclude>
+                       </excludes>
+               </fileSet>
+               <fileSet>
+                       
<directory>${project.parent.basedir}/openmeetings-webservice/target/site</directory><!--
 FIXME should be implemented differently -->
+                       
<outputDirectory>${om.webapp}/docs/openmeetings-webservice</outputDirectory>
                        <excludes>
                                <exclude>javadoc.sh</exclude>
                                <exclude>options</exclude>

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/site.xml?rev=1625526&r1=1625525&r2=1625526&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/site/site.xml 
(original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/site/site.xml Wed 
Sep 17 11:47:05 2014
@@ -16,33 +16,7 @@
   xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 
http://maven.apache.org/xsd/decoration-1.4.0.xsd";
   name="Apache OpenMeetings Project">
 
-    <bannerLeft>
-       <name>Apache OpenMeetings</name>
-       <src>/images/logo-2.jpg</src>
-       <href>/index.html</href>
-    </bannerLeft>
-
-       <skin>
-               <groupId>org.apache.maven.skins</groupId>
-               <artifactId>maven-fluido-skin</artifactId>
-               <version>1.3.1</version>
-       </skin>
-       
-       <version position="none"/>
-       
        <body>
-               <head>
-                       <link rel="stylesheet" href="./css/openmeetings.css"/>
-                       <script type="text/javascript" 
src="./js/site.js"></script>
-               </head>
-               
-               <links>
-                       <item name="Demo" href="demo.html"/>
-                       <item name="Download" href="downloads.html"/>
-                       <item name="Installation" href="installation.html"/>
-                       <item name="Wiki" 
href="https://cwiki.apache.org/confluence/display/OPENMEETINGS"/>
-               </links>
-               
                <menu>
                        <item name="General" href="#general">
                                <item name="Home" href="/index.html"/>
@@ -77,7 +51,7 @@
                                <item name="Website Guide" 
href="/WebsiteGuide.html" />
                        </item>
                        <item name="Integration" href="#integration">
-                               <item name="SOAP/REST API" 
href="/webservices/index.html" target="_blank"/>
+                               <item name="SOAP/REST API" 
href="/openmeetings-webservice/apidocs/index.html" target="_blank"/>
                                <item name="REST API Sample" 
href="/RestAPISample.html" />
                                <item name="Ldap and ADS" 
href="/LdapAndADS.html" />
                                <item name="OAuth2" href="/oauth2.html" />
@@ -148,13 +122,4 @@
                        </item>
                </menu>
        </body>
-       
-       <poweredBy></poweredBy>
-       
-       <custom>
-               <fluidoSkin>
-                       <topBarEnabled>false</topBarEnabled>
-                       <sideBarEnabled>true</sideBarEnabled>
-               </fluidoSkin>
-       </custom>
 </project>

Modified: openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml?rev=1625526&r1=1625525&r2=1625526&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml Wed Sep 17 
11:47:05 2014
@@ -30,7 +30,7 @@
        <name>Openmeetings Service</name>
        <description>TODO</description>
        <properties>
-               
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <site.basedir>${project.parent.basedir}</site.basedir>
        </properties>
        <dependencies>
                <dependency>

Propchange: openmeetings/trunk/singlewebapp/openmeetings-service/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Sep 17 11:47:05 2014
@@ -0,0 +1,2 @@
+site
+

Modified: openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml?rev=1625526&r1=1625525&r2=1625526&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml Wed Sep 17 
11:47:05 2014
@@ -30,11 +30,11 @@
        <name>Openmeetings Util</name>
        <description>TODO</description>
        <properties>
-               
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <dom4j.version>1.6.1</dom4j.version>
                <mail.version>1.4.7</mail.version>
                <commons-codec.version>1.8</commons-codec.version>
                <servlet-api.version>2.5</servlet-api.version>
+               <site.basedir>${project.parent.basedir}</site.basedir>
        </properties>
        <build>
                <plugins>

Propchange: openmeetings/trunk/singlewebapp/openmeetings-util/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Sep 17 11:47:05 2014
@@ -0,0 +1,2 @@
+site
+

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml?rev=1625526&r1=1625525&r2=1625526&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml Wed Sep 17 
11:47:05 2014
@@ -30,13 +30,13 @@
        <name>Openmeetings Web</name>
        <description>TODO</description>
        <properties>
-               
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                
<wicket-dashboard.version>0.11.0+wicket-7</wicket-dashboard.version>
                <commons-io.version>2.4</commons-io.version>
                <commons-fileupload.version>1.3</commons-fileupload.version>
                <mysql.version>5.1.30</mysql.version>
                
<old-backups.dir>${project.build.directory}/old-backups</old-backups.dir>
                <backup.to.check>backup_v_2_0_0_r1361497.zip</backup.to.check>
+               <site.basedir>${project.parent.basedir}</site.basedir>
        </properties>
        <profiles>
                <profile>

Propchange: openmeetings/trunk/singlewebapp/openmeetings-web/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Sep 17 11:47:05 2014
@@ -0,0 +1,2 @@
+site
+

Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml?rev=1625526&r1=1625525&r2=1625526&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml Wed Sep 17 
11:47:05 2014
@@ -30,7 +30,7 @@
        <name>Openmeetings Webservices</name>
        <description>TODO</description>
        <properties>
-               
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <site.basedir>${project.parent.basedir}</site.basedir>
        </properties>
        <build>
                <plugins>
@@ -58,36 +58,6 @@
                                </executions>
                        </plugin>
                </plugins>
-               <pluginManagement>
-                       <plugins>
-                               <!--This plugin's configuration is used to 
store Eclipse m2e settings only. It has no influence on the Maven build 
itself.-->
-                               <plugin>
-                                       <groupId>org.eclipse.m2e</groupId>
-                                       
<artifactId>lifecycle-mapping</artifactId>
-                                       <version>1.0.0</version>
-                                       <configuration>
-                                               <lifecycleMappingMetadata>
-                                                       <pluginExecutions>
-                                                               
<pluginExecution>
-                                                                       
<pluginExecutionFilter>
-                                                                               
<groupId>org.apache.maven.plugins</groupId>
-                                                                               
<artifactId>maven-javadoc-plugin</artifactId>
-                                                                               
<versionRange>[2.9.1,)</versionRange>
-                                                                               
<goals>
-                                                                               
        <goal>javadoc</goal>
-                                                                               
        <goal>aggregate</goal>
-                                                                               
</goals>
-                                                                       
</pluginExecutionFilter>
-                                                                       <action>
-                                                                               
<ignore></ignore>
-                                                                       
</action>
-                                                               
</pluginExecution>
-                                                       </pluginExecutions>
-                                               </lifecycleMappingMetadata>
-                                       </configuration>
-                               </plugin>
-                       </plugins>
-               </pluginManagement>
        </build>
        <dependencies>
                <dependency>

Propchange: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Sep 17 11:47:05 2014
@@ -0,0 +1,2 @@
+site
+

Modified: openmeetings/trunk/singlewebapp/pom.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1625526&r1=1625525&r2=1625526&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Wed Sep 17 11:47:05 2014
@@ -28,7 +28,7 @@
        <artifactId>openmeetings-parent</artifactId>
        <version>3.1.0-SNAPSHOT</version>
        <packaging>pom</packaging>
-       <name>Openmeetings Parent</name>
+       <name>Openmeetings</name>
        <description>TODO</description>
        <properties>
                
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -51,6 +51,8 @@
                <red5-client.version>1.0.3-RELEASE</red5-client.version>
                <simple-xml.version>2.7.1</simple-xml.version>
                <jettison.version>1.3.5</jettison.version>
+               <site.basedir>${project.basedir}</site.basedir>
+               <skip.site.copy>false</skip.site.copy>
        </properties>
        <modules>
                <module>openmeetings-util</module>
@@ -547,11 +549,44 @@
                                <artifactId>maven-bundle-plugin</artifactId>
                        </plugin>
                        <plugin>
+                               <artifactId>maven-resources-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>copy-siteresources</id>
+                                               
<phase>generate-resources</phase>
+                                               <goals>
+                                                       
<goal>copy-resources</goal>
+                                               </goals>
+                                               <configuration>
+                                                       
<outputDirectory>${project.basedir}/src/site</outputDirectory>
+                                                       <resources>
+                                                               <resource>
+                                                                       
<directory>${site.basedir}/src/site/resources</directory>
+                                                                       
<includes>
+                                                                               
<include>*.xml</include>
+                                                                       
</includes>
+                                                               </resource>
+                                                       </resources>
+                                                       
<skip>${skip.site.copy}</skip>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-site-plugin</artifactId>
                                <configuration>
-                                       <skip>true</skip>
+                                       <skip>${om.quick.build}</skip>
                                </configuration>
+                               <executions>
+                                       <execution>
+                                               <id>generate-site</id>
+                                               
<phase>generate-resources</phase>
+                                               <goals>
+                                                       <goal>site</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
                        </plugin>
                        <plugin>
                                <groupId>org.codehaus.mojo</groupId>
@@ -815,6 +850,33 @@
                                                                                
<ignore />
                                                                        
</action>
                                                                
</pluginExecution>
+                                                               
<pluginExecution>
+                                                                       
<pluginExecutionFilter>
+                                                                               
<groupId>org.apache.maven.plugins</groupId>
+                                                                               
<artifactId>maven-site-plugin</artifactId>
+                                                                               
<versionRange>[3.4,)</versionRange>
+                                                                               
<goals>
+                                                                               
        <goal>site</goal>
+                                                                               
</goals>
+                                                                       
</pluginExecutionFilter>
+                                                                       <action>
+                                                                               
<ignore />
+                                                                       
</action>
+                                                               
</pluginExecution>
+                                                               
<pluginExecution>
+                                                                       
<pluginExecutionFilter>
+                                                                               
<groupId>org.apache.maven.plugins</groupId>
+                                                                               
<artifactId>maven-javadoc-plugin</artifactId>
+                                                                               
<versionRange>[2.9.1,)</versionRange>
+                                                                               
<goals>
+                                                                               
        <goal>javadoc</goal>
+                                                                               
        <goal>aggregate</goal>
+                                                                               
</goals>
+                                                                       
</pluginExecutionFilter>
+                                                                       <action>
+                                                                               
<ignore></ignore>
+                                                                       
</action>
+                                                               
</pluginExecution>
                                                        </pluginExecutions>
                                                </lifecycleMappingMetadata>
                                        </configuration>

Added: openmeetings/trunk/singlewebapp/src/site/resources/site.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/site/resources/site.xml?rev=1625526&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/site/resources/site.xml (added)
+++ openmeetings/trunk/singlewebapp/src/site/resources/site.xml Wed Sep 17 
11:47:05 2014
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed 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.
+ -->
+<project xmlns="http://maven.apache.org/DECORATION/1.4.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 
http://maven.apache.org/xsd/decoration-1.4.0.xsd";
+  name="Apache OpenMeetings Project">
+
+       <body>
+               <menu ref="parent"/>
+               <menu name="Project">
+                       <item name="About" href="/index.html" />
+                       <item name="Info" href="/project-info.html" />
+                       <item name="Summary" href="/project-summary.html" />
+                       <item name="License" href="/license.html" />
+                       <item name="Dependencies" href="/dependencies.html" />
+                       <item name="Dependency Convergence" 
href="/dependency-convergence.html" />
+                       <item name="RAT Report" href="/rat-report.html" />
+                       <item name="JavaDoc" href="/apidocs/index.html" 
target="_blank" />
+               </menu>
+       </body>
+</project>

Added: openmeetings/trunk/singlewebapp/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/site/site.xml?rev=1625526&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/site/site.xml (added)
+++ openmeetings/trunk/singlewebapp/src/site/site.xml Wed Sep 17 11:47:05 2014
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed 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.
+ -->
+<project xmlns="http://maven.apache.org/DECORATION/1.4.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 
http://maven.apache.org/xsd/decoration-1.4.0.xsd";
+  name="Apache OpenMeetings Project">
+
+    <bannerLeft>
+       <name>Apache OpenMeetings</name>
+       <src>http://openmeetings.apache.org/images/logo-2.jpg</src>
+       <href>http://openmeetings.apache.org/index.html</href>
+    </bannerLeft>
+
+       <skin>
+               <groupId>org.apache.maven.skins</groupId>
+               <artifactId>maven-fluido-skin</artifactId>
+               <version>1.3.1</version>
+       </skin>
+       
+       <version position="none"/>
+       
+       <body>
+               <head>
+                       <link rel="stylesheet" 
href="http://openmeetings.apache.org/css/openmeetings.css"/>
+                       <script type="text/javascript" 
src="http://openmeetings.apache.org/js/site.js";></script>
+               </head>
+               
+               <links>
+                       <item name="Demo" 
href="http://openmeetings.apache.org/demo.html"/>
+                       <item name="Download" 
href="http://openmeetings.apache.org/downloads.html"/>
+                       <item name="Installation" 
href="http://openmeetings.apache.org/installation.html"/>
+                       <item name="Wiki" 
href="https://cwiki.apache.org/confluence/display/OPENMEETINGS"/>
+               </links>
+               <menu ref="modules" inherit="bottom"/>
+       </body>
+       
+       <poweredBy></poweredBy>
+       
+       <custom>
+               <fluidoSkin>
+                       <topBarEnabled>false</topBarEnabled>
+                       <sideBarEnabled>true</sideBarEnabled>
+               </fluidoSkin>
+       </custom>
+</project>


Reply via email to