Author: [email protected] Date: Wed Apr 27 16:16:38 2011 New Revision: 1038 Log: [AMDATU-355] Refactored artifact ids to be in line with other subprojects, added checkstyle config and mvn site configuration
Added: trunk/amdatu-opensocial/etc/ trunk/amdatu-opensocial/etc/checkstyle/ trunk/amdatu-opensocial/etc/checkstyle/amdatu_checks.xml Modified: trunk/amdatu-opensocial/dashboard/pom.xml trunk/amdatu-opensocial/gadgetmanagement/pom.xml trunk/amdatu-opensocial/pom.xml trunk/amdatu-opensocial/profile/pom.xml trunk/amdatu-opensocial/shindig/pom.xml Modified: trunk/amdatu-opensocial/dashboard/pom.xml ============================================================================== --- trunk/amdatu-opensocial/dashboard/pom.xml (original) +++ trunk/amdatu-opensocial/dashboard/pom.xml Wed Apr 27 16:16:38 2011 @@ -3,12 +3,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.amdatu</groupId> + <groupId>org.amdatu.opensocial</groupId> <artifactId>org.amdatu.opensocial</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.opensocial</groupId> - <artifactId>dashboard</artifactId> + <artifactId>org.amdatu.opensocial.dashboard</artifactId> <packaging>bundle</packaging> <name>Amdatu Open Social - Dashboard</name> <description>Dashboard application (gadget container UI)</description> Added: trunk/amdatu-opensocial/etc/checkstyle/amdatu_checks.xml ============================================================================== --- (empty file) +++ trunk/amdatu-opensocial/etc/checkstyle/amdatu_checks.xml Wed Apr 27 16:16:38 2011 @@ -0,0 +1,225 @@ +<?xml version="1.0"?> +<!DOCTYPE module PUBLIC + "-//Puppy Crawl//DTD Check Configuration 1.3//EN" + "http://www.puppycrawl.com/dtds/configuration_1_3.dtd";> + +<module name="Checker"> + <!-- + If you set the basedir property below, then all reported file + names will be relative to the specified directory. See + http://checkstyle.sourceforge.net/5.x/config.html#Checker + + <property name="basedir" value="${basedir}"/> + --> + + <!-- Checks that property files contain the same keys. --> + <!-- See http://checkstyle.sf.net/config_misc.html#Translation --> + <module name="Translation"/> + + <!-- Checks for Size Violations. --> + <!-- See http://checkstyle.sf.net/config_sizes.html --> + <module name="FileLength"/> + + <!-- Checks for whitespace --> + <!-- See http://checkstyle.sf.net/config_whitespace.html --> + <module name="FileTabCharacter"/> + + <!-- Miscellaneous other checks. --> + <!-- See http://checkstyle.sf.net/config_misc.html --> + <module name="RegexpSingleline"> + <property name="format" value="[^\*]\s+$"/> + <property name="minimum" value="0"/> + <property name="maximum" value="0"/> + <property name="message" value="Line has trailing spaces."/> + </module> + + <module name="TreeWalker"> + + <!-- Checks for Javadoc comments. --> + <!-- See http://checkstyle.sf.net/config_javadoc.html --> + <module name="JavadocMethod"> + <property name="scope" value="public"/> + <property name="tokens" value="INTERFACE_DEF"/> + </module> + <module name="JavadocType"> + <property name="scope" value="public"/> + <property name="tokens" value="INTERFACE_DEF"/> + </module> + <module name="JavadocVariable"> + <property name="scope" value="public"/> + </module> + <module name="JavadocStyle"/> + + + <!-- Checks for Naming Conventions. --> + <!-- See http://checkstyle.sf.net/config_naming.html --> + <module name="ConstantName"/> + <module name="LocalFinalVariableName"/> + <module name="LocalVariableName"/> + <module name="MemberName"> + <property name="format" value="^m_[a-z][a-zA-Z0-9]*$"/> + </module> + <module name="MethodName"/> + <module name="PackageName"/> + <module name="ParameterName"/> + <module name="StaticVariableName"> + <property name="format" value="^[A-Z][A-Z0-9_]*$"/> + </module> + <module name="TypeName"/> + + + <!-- Checks for Headers --> + <!-- See http://checkstyle.sf.net/config_header.html --> + <!-- <module name="Header"> --> + <!-- The follow property value demonstrates the ability --> + <!-- to have access to ANT properties. In this case it uses --> + <!-- the ${basedir} property to allow Checkstyle to be run --> + <!-- from any directory within a project. See property --> + <!-- expansion, --> + <!-- http://checkstyle.sf.net/config.html#properties --> + <!-- <property --> + <!-- name="headerFile" --> + <!-- value="${basedir}/java.header"/> --> + <!-- </module> --> + + <!-- Following interprets the header file as regular expressions. --> + <!-- <module name="RegexpHeader"/> --> + + + <!-- Checks for imports --> + <!-- See http://checkstyle.sf.net/config_import.html --> + <module name="AvoidStarImport"/> + <module name="IllegalImport"/> <!-- defaults to sun.* packages --> + <module name="RedundantImport"/> + <module name="UnusedImports"/> + + + <!-- Checks for Size Violations. --> + <!-- See http://checkstyle.sf.net/config_sizes.html --> + <module name="LineLength"> + <property name="max" value="120"/> + </module> + <module name="MethodLength"/> + <module name="ParameterNumber"/> + + + <!-- Checks for whitespace --> + <!-- See http://checkstyle.sf.net/config_whitespace.html --> + <module name="EmptyForIteratorPad"/> + <module name="GenericWhitespace"/> + <module name="MethodParamPad"/> + <module name="NoWhitespaceAfter"/> + <module name="NoWhitespaceBefore"/> + <module name="OperatorWrap"/> + <module name="ParenPad"/> + <module name="TypecastParenPad"/> + <module name="WhitespaceAfter"/> + <module name="WhitespaceAround"> + <property name="tokens" value="ASSIGN"/> + <property name="tokens" value="BAND"/> + <property name="tokens" value="BAND_ASSIGN"/> + <property name="tokens" value="BOR"/> + <property name="tokens" value="BOR_ASSIGN"/> + <property name="tokens" value="BSR"/> + <property name="tokens" value="BSR_ASSIGN"/> + <property name="tokens" value="BXOR"/> + <property name="tokens" value="BXOR_ASSIGN"/> + <property name="tokens" value="COLON"/> + <property name="tokens" value="DIV"/> + <property name="tokens" value="DIV_ASSIGN"/> + <property name="tokens" value="EQUAL"/> + <property name="tokens" value="GE"/> + <property name="tokens" value="GT"/> + <property name="tokens" value="LAND"/> + <property name="tokens" value="LE"/> + <property name="tokens" value="LITERAL_ASSERT"/> + <property name="tokens" value="LITERAL_CATCH"/> + <property name="tokens" value="LITERAL_DO"/> + <property name="tokens" value="LITERAL_ELSE"/> + <property name="tokens" value="LITERAL_FINALLY"/> + <property name="tokens" value="LITERAL_FOR"/> + <property name="tokens" value="LITERAL_IF"/> + <property name="tokens" value="LITERAL_RETURN"/> + <property name="tokens" value="LITERAL_SYNCHRONIZED"/> + <property name="tokens" value="LITERAL_TRY"/> + <property name="tokens" value="LITERAL_WHILE"/> + <property name="tokens" value="LOR"/> + <property name="tokens" value="LT"/> + <property name="tokens" value="MINUS"/> + <property name="tokens" value="MINUS_ASSIGN"/> + <property name="tokens" value="MOD"/> + <property name="tokens" value="MOD_ASSIGN"/> + <property name="tokens" value="NOT_EQUAL"/> + <property name="tokens" value="PLUS"/> + <property name="tokens" value="PLUS_ASSIGN"/> + <property name="tokens" value="QUESTION"/> + <property name="tokens" value="SL"/> + <property name="tokens" value="SLIST"/> + <property name="tokens" value="SL_ASSIGN"/> + <property name="tokens" value="SR"/> + <property name="tokens" value="SR_ASSIGN"/> + <property name="tokens" value="STAR"/> + <property name="tokens" value="STAR_ASSIGN"/> + <property name="tokens" value="TYPE_EXTENSION_AND"/> + <property name="allowEmptyConstructors" value="true"/> + <property name="allowEmptyMethods" value="true"/> + </module> + + + <!-- Modifier Checks --> + <!-- See http://checkstyle.sf.net/config_modifiers.html --> + <module name="ModifierOrder"/> + <module name="RedundantModifier"/> + + + <!-- Checks for blocks. You know, those {}'s --> + <!-- See http://checkstyle.sf.net/config_blocks.html --> + <module name="AvoidNestedBlocks"/> + <module name="EmptyBlock"> + <property name="tokens" value="LITERAL_DO"/> + <property name="tokens" value="LITERAL_ELSE"/> + <property name="tokens" value="LITERAL_FINALLY"/> + <property name="tokens" value="LITERAL_IF"/> + <property name="tokens" value="LITERAL_FOR"/> + <property name="tokens" value="LITERAL_TRY"/> + <property name="tokens" value="LITERAL_WHILE"/> + <property name="tokens" value="INSTANCE_INIT"/> + <property name="tokens" value="STATIC_INIT"/> + </module> + <module name="LeftCurly"/> + <module name="NeedBraces"/> + <module name="RightCurly"> + <property name="option" value="alone"/> + </module> + + <!-- Checks for common coding problems --> + <!-- See http://checkstyle.sf.net/config_coding.html --> + <module name="AvoidInlineConditionals"/> + <module name="DoubleCheckedLocking"/> <!-- MY FAVOURITE --> + <module name="EmptyStatement"/> + <module name="EqualsHashCode"/> + <module name="HiddenField"/> + <module name="IllegalInstantiation"/> + <module name="InnerAssignment"/> + <module name="MissingSwitchDefault"/> + <module name="RedundantThrows"/> + <module name="SimplifyBooleanExpression"/> + <module name="SimplifyBooleanReturn"/> + + <!-- Checks for class design --> + <!-- See http://checkstyle.sf.net/config_design.html --> + <module name="FinalClass"/> + <module name="HideUtilityClassConstructor"/> + <module name="VisibilityModifier"/> + + + <!-- Miscellaneous other checks. --> + <!-- See http://checkstyle.sf.net/config_misc.html --> + <module name="ArrayTypeStyle"/> + <module name="FinalParameters"/> + <module name="TodoComment"/> + <module name="UpperEll"/> + + </module> + +</module> Modified: trunk/amdatu-opensocial/gadgetmanagement/pom.xml ============================================================================== --- trunk/amdatu-opensocial/gadgetmanagement/pom.xml (original) +++ trunk/amdatu-opensocial/gadgetmanagement/pom.xml Wed Apr 27 16:16:38 2011 @@ -2,12 +2,11 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.amdatu</groupId> + <groupId>org.amdatu.opensocial</groupId> <artifactId>org.amdatu.opensocial</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.opensocial</groupId> - <artifactId>gadgetmanagement</artifactId> + <artifactId>org.amdatu.opensocial.gadgetmanagement</artifactId> <packaging>bundle</packaging> <name>Amdatu Open Social - Gadget Management</name> <description>Provides a service to manage gadgets stored in the gadget store</description> Modified: trunk/amdatu-opensocial/pom.xml ============================================================================== --- trunk/amdatu-opensocial/pom.xml (original) +++ trunk/amdatu-opensocial/pom.xml Wed Apr 27 16:16:38 2011 @@ -5,13 +5,14 @@ <parent> <groupId>org.amdatu</groupId> <artifactId>amdatu</artifactId> - <version>2</version> + <version>2-SNAPSHOT</version> <relativePath>../amdatu-parent/pom.xml</relativePath> </parent> + <groupId>org.amdatu.opensocial</groupId> <artifactId>org.amdatu.opensocial</artifactId> <version>0.2.0-SNAPSHOT</version> <name>Amdatu Open Social</name> - <description>This module consists of all Open Social related bundles</description> + <description>This project adds OpenSocial functionality to the Amdatu Platform</description> <packaging>pom</packaging> <properties> @@ -181,6 +182,14 @@ </dependencies> </dependencyManagement> + <distributionManagement> + <site> + <name>Amdatu Sites</name> + <id>amdatu.sites</id> + <url>dav:http://repository.amdatu.org/sites/opensocial/${project.version}</url> + </site> + </distributionManagement> + <modules> <module>dashboard</module> <module>gadgetmanagement</module> @@ -188,8 +197,53 @@ <module>shindig</module> </modules> - <build> - <finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName> + <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <version>2.1.1</version> + <executions> + <execution> + <id>bundle-sources</id> + <phase>deploy</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> </build> + <reporting> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.6</version> + <configuration> + <!-- Aggregation is not yet supported in 2.6. A highly popular JIRA issue has + been created to resolve this issue: http://jira.codehaus.org/browse/MCHECKSTYLE-62 + <aggregate>true</aggregate> + --> + + <linkXref>true</linkXref> + <configLocation>etc/checkstyle/amdatu_checks.xml</configLocation> + <enableRulesSummary>false</enableRulesSummary> + </configuration> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.7</version> + <configuration> + <aggregate>true</aggregate> + <show>public</show> + <detectOfflineLinks>false</detectOfflineLinks> + <excludePackageNames>org.amdatu.opensocial.dashboard.*:org.amdatu.opensocial.gadgetmanagement.*:org.amdatu.opensocial.profile.*:org.amdatu.opensocial.shindig.*</excludePackageNames> + </configuration> + </plugin> + </plugins> + </reporting> + </project> \ No newline at end of file Modified: trunk/amdatu-opensocial/profile/pom.xml ============================================================================== --- trunk/amdatu-opensocial/profile/pom.xml (original) +++ trunk/amdatu-opensocial/profile/pom.xml Wed Apr 27 16:16:38 2011 @@ -2,12 +2,11 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.amdatu</groupId> + <groupId>org.amdatu.opensocial</groupId> <artifactId>org.amdatu.opensocial</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.opensocial</groupId> - <artifactId>profile</artifactId> + <artifactId>org.amdatu.opensocial.profile</artifactId> <packaging>bundle</packaging> <name>Amdatu Open Social - Profile Service</name> <description>Provides a profile service on top of the OpenSocial services</description> Modified: trunk/amdatu-opensocial/shindig/pom.xml ============================================================================== --- trunk/amdatu-opensocial/shindig/pom.xml (original) +++ trunk/amdatu-opensocial/shindig/pom.xml Wed Apr 27 16:16:38 2011 @@ -2,12 +2,11 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.amdatu</groupId> + <groupId>org.amdatu.opensocial</groupId> <artifactId>org.amdatu.opensocial</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <groupId>org.amdatu.opensocial</groupId> - <artifactId>shindig</artifactId> + <artifactId>org.amdatu.opensocial.shindig</artifactId> <packaging>bundle</packaging> <name>Amdatu Open Social - Apache Shindig Application</name> <description>This bundle includes the Apache Shindig libraries and exports the opensocial API as OSGi services</description> _______________________________________________ Amdatu-commits mailing list [email protected] http://lists.amdatu.org/mailman/listinfo/amdatu-commits
