Skip to content

Commit bc01763

Browse files
abmargbabmargb
committed
Merge remote-tracking branch 'origin/master' into multi-domain-fixes
Conflicts: src/main/java/org/buddycloud/channelserver/ChannelsEngine.java src/main/java/org/buddycloud/channelserver/Configuration.java src/main/java/org/buddycloud/channelserver/channel/ChannelManager.java src/main/java/org/buddycloud/channelserver/channel/ChannelManagerFactoryImpl.java src/main/java/org/buddycloud/channelserver/channel/ChannelManagerImpl.java src/main/java/org/buddycloud/channelserver/channel/LocalDomainChecker.java src/main/java/org/buddycloud/channelserver/db/NodeStore.java src/main/java/org/buddycloud/channelserver/db/jdbc/JDBCNodeStore.java src/main/java/org/buddycloud/channelserver/db/jdbc/dialect/Sql92NodeStoreDialect.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/discoinfo/DiscoInfoGet.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/discoitems/DiscoItemsGet.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/mam/MessageArchiveManagement.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/AffiliationsGet.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/NodeConfigureGet.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/NodeThreadsGet.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/RecentItemsGet.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/RepliesGet.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/SubscriptionsGet.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/ThreadGet.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/UserItemsGet.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/items/NodeItemsGet.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/items/SpecialItemsGet.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/items/special/FirehoseGet.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/result/ItemsResult.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/result/SubscriptionsResult.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/AffiliationEvent.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/ItemDelete.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/NodeConfigure.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/NodeCreate.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/NodeDelete.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/SubscribeSet.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/SubscriptionEvent.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/UnsubscribeSet.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/register/RegisterSet.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/register/UnregisterSet.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/search/Search.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/search/SearchGet.java src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/search/SearchSet.java src/main/java/org/buddycloud/channelserver/packetprocessor/message/event/AbstractMessageProcessor.java src/main/java/org/buddycloud/channelserver/packetprocessor/message/event/AffiliationProcessor.java src/main/java/org/buddycloud/channelserver/packetprocessor/message/event/ConfigurationProcessor.java src/main/java/org/buddycloud/channelserver/packetprocessor/message/event/DeleteProcessor.java src/main/java/org/buddycloud/channelserver/packetprocessor/message/event/ItemsProcessor.java src/main/java/org/buddycloud/channelserver/packetprocessor/message/event/RetractItemProcessor.java src/main/java/org/buddycloud/channelserver/packetprocessor/message/event/SubscriptionProcessor.java src/test/java/org/buddycloud/channelserver/channel/ChannelManagerImplTest.java src/test/java/org/buddycloud/channelserver/channel/TestHelper.java src/test/java/org/buddycloud/channelserver/channel/validate/AtomEntryTest.java src/test/java/org/buddycloud/channelserver/db/jdbc/DatabaseTester.java src/test/java/org/buddycloud/channelserver/db/jdbc/JDBCNodeStoreAbstract.java src/test/java/org/buddycloud/channelserver/db/jdbc/JDBCNodeStoreTest.java src/test/java/org/buddycloud/channelserver/packetHandler/iq/TestHandler.java src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/discoitems/DiscoItemsGetTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/mam/MessageArchiveManagementTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/NodeConfigureGetTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/NodeThreadsGetTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/SubscriptionsGetTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/items/NodeItemsGetTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/items/UserSingleItemGetTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/items/special/FirehoseGetTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/result/ItemsResultTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/AffiliationEventTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/ItemDeleteTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/NodeConfigureTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/NodeCreateTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/NodeDeleteTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/PublishTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/SubscribeSetTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/SubscriptionEventTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/UnsubscribeSetTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/register/RegisterSetTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/register/UnregisterSetTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/search/SearchGetTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/search/SearchSetTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/message/event/AffiliationProcessorTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/message/event/ConfigurationProcessorTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/message/event/DeleteProcessorTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/message/event/ItemsProcessorTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/message/event/NotificationSendingMockTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/message/event/RetractItemProcessorTest.java src/test/java/org/buddycloud/channelserver/packetprocessor/message/event/SubscriptionProcessorTest.java
2 parents ebdecf9 + bdb00aa commit bc01763

178 files changed

Lines changed: 14173 additions & 15390 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.settings
22
.DS_Store
33
.project
4+
.checkstyle
45
target
56
.classpath
67
target

‎.travis.yml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@ jdk:
33
- oraclejdk7
44
- openjdk6
55
- openjdk7
6-
7-
8-
env:
9-
global:
10-
- MAVEN_URL=http://apache.mirrors.pair.com/maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz
11-
install:
12-
- wget -O - $MAVEN_URL | sudo tar xvz -C /usr/local
13-
- sudo rm /usr/local/maven
14-
- sudo ln -s /usr/local/apache-maven-3.0.5 /usr/local/maven
6+
7+
after_success:
8+
- mvn -DserviceJobId=$TRAVIS_JOB_ID clean cobertura:cobertura coveralls:cobertura -Dcobertura.report.format=xml

‎README.md‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,20 @@ A buddycloud server written in Java, implementing the [buddycloud channels](http
66

77
Note this points to the main buddycloud repository for the java server.
88

9-
[![Build Status](https://travis-ci.org/buddycloud/buddycloud-server-java.png?branch=master)](https://travis-ci.org/buddycloud/buddycloud-server-java)
9+
[![Build Status](https://travis-ci.org/buddycloud/buddycloud-server-java.png?branch=master)](https://travis-ci.org/buddycloud/buddycloud-server-java) [![Coverage Status](https://img.shields.io/coveralls/buddycloud/buddycloud-server-java.svg)](https://coveralls.io/r/buddycloud/buddycloud-server-java)
10+
11+
## Coding Standards
12+
13+
Checkstyle is used to confirm the preferred coding standards are used, these are based loosely on Google's OS Java guidelines. There is support in maven, the build should fail on the introduction of errors and there is also support for automated formatting in Eclipse. To setup do the following -
14+
15+
* Navigate to Eclipse->Preferences->Java ->Code Style->Formatter
16+
* Select 'import' and there is a file named 'eclipse_formatter.xml' in src/main/resources.
17+
* Import and set it as the active profile
18+
19+
N.B. Its also worth setting up the hooks that allow for formatting and organising of imports on save, to do this
20+
21+
* Navigate to Eclipse->Preferences->Java->Code Style->Save Actions
22+
* Select 'Format All Lines' and 'Organize Imports'
1023

1124
## Database install
1225

‎pom.xml‎

Lines changed: 139 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,35 @@
66
<packaging>jar</packaging>
77
<version>0.18.0-SNAPSHOT</version>
88
<name>Buddycloud Java Server</name>
9+
910
<scm>
11+
<connection>scm:git:git@github.buddycloud/buddycloud-server-java.git</connection>
12+
<developerConnection>scm:git:git@github.com:buddycloud/buddycloud-server-java.git</developerConnection>
1013
<url>https://github.com/buddycloud/buddycloud-server-java</url>
1114
</scm>
15+
16+
<issueManagement>
17+
<system>GitHub Issues</system>
18+
<url>https://github.com/buddycloud/buddycloud-server-java/issues</url>
19+
</issueManagement>
20+
<ciManagement>
21+
<system>travis</system>
22+
<url>https://travis-ci.org/buddycloud/buddycloud-server-java</url>
23+
</ciManagement>
24+
25+
26+
<properties>
27+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
28+
<project.build.withDependencies>jar-with-dependencies</project.build.withDependencies>
29+
<maven.checkstyle.plugin.version>2.13</maven.checkstyle.plugin.version>
30+
<checkstyle.config.location>src/main/resources/checkstyle.xml</checkstyle.config.location>
31+
</properties>
32+
1233
<dependencies>
1334
<dependency>
14-
<groupId>org.xbill</groupId>
15-
<artifactId>dnsjava</artifactId>
16-
<version>2.1.6</version>
35+
<groupId>org.xbill</groupId>
36+
<artifactId>dnsjava</artifactId>
37+
<version>2.1.6</version>
1738
</dependency>
1839
<dependency>
1940
<groupId>junit</groupId>
@@ -98,41 +119,41 @@
98119
<scope>test</scope>
99120
</dependency>
100121
<dependency>
101-
<groupId>org.hsqldb</groupId>
102-
<artifactId>hsqldb</artifactId>
103-
<version>2.2.8</version>
122+
<groupId>org.hsqldb</groupId>
123+
<artifactId>hsqldb</artifactId>
124+
<version>2.2.8</version>
104125
</dependency>
105126
<dependency>
106-
<groupId>commons-collections</groupId>
107-
<artifactId>commons-collections</artifactId>
108-
<version>3.2.1</version>
127+
<groupId>commons-collections</groupId>
128+
<artifactId>commons-collections</artifactId>
129+
<version>3.2.1</version>
109130
</dependency>
110131
<dependency>
111-
<groupId>nl.jqno.equalsverifier</groupId>
112-
<artifactId>equalsverifier</artifactId>
113-
<version>1.1.3</version>
114-
<scope>test</scope>
132+
<groupId>nl.jqno.equalsverifier</groupId>
133+
<artifactId>equalsverifier</artifactId>
134+
<version>1.1.3</version>
135+
<scope>test</scope>
115136
</dependency>
116137
<dependency>
117-
<groupId>proxool</groupId>
118-
<artifactId>proxool</artifactId>
119-
<version>0.8.3</version>
138+
<groupId>proxool</groupId>
139+
<artifactId>proxool</artifactId>
140+
<version>0.8.3</version>
120141
</dependency>
121142
<dependency>
122-
<groupId>commons-lang</groupId>
123-
<artifactId>commons-lang</artifactId>
124-
<version>2.6</version>
143+
<groupId>commons-lang</groupId>
144+
<artifactId>commons-lang</artifactId>
145+
<version>2.6</version>
125146
</dependency>
126147
<dependency>
127148
<groupId>org.lazyluke</groupId>
128149
<artifactId>log4jdbc-remix</artifactId>
129150
<version>0.2.3</version>
130-
</dependency>
131-
<dependency>
151+
</dependency>
152+
<dependency>
132153
<groupId>joda-time</groupId>
133154
<artifactId>joda-time</artifactId>
134155
<version>2.3</version>
135-
</dependency>
156+
</dependency>
136157
<dependency>
137158
<groupId>net.xeoh</groupId>
138159
<artifactId>jspf.core</artifactId>
@@ -146,60 +167,54 @@
146167
<url>file:${project.basedir}/repo</url>
147168
</repository>
148169
</repositories>
149-
<pluginRepositories>
150-
<pluginRepository>
151-
<id>evgenyg</id>
152-
<name>Evgeny Goldin repo</name>
153-
<url>http://evgenyg.artifactoryonline.com/evgenyg/repo/com/github/goldin/</url>
154-
</pluginRepository>
155-
</pluginRepositories>
156170
<build>
171+
<pluginManagement>
157172
<plugins>
158173
<plugin>
159174
<!-- Extended Maven antrun plugin -->
160175
<!-- https://maven-antrun-extended-plugin.dev.java.net/ -->
161176
<groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
162177
<artifactId>maven-antrun-extended-plugin</artifactId>
163178
<executions>
164-
<execution>
165-
<id>test-reports</id>
166-
<phase>test</phase>
167-
<configuration>
168-
<tasks unless="maven.test.skip">
169-
<junitreport todir="target/surefire-reports">
170-
<fileset dir="target/surefire-reports">
171-
<include name="**/*.xml"/>
172-
</fileset>
173-
<report format="noframes" todir="target/surefire-reports"/>
174-
</junitreport>
175-
</tasks>
176-
</configuration>
177-
<goals>
178-
<goal>run</goal>
179-
</goals>
180-
</execution>
179+
<execution>
180+
<id>test-reports</id>
181+
<phase>test</phase>
182+
<configuration>
183+
<tasks unless="maven.test.skip">
184+
<junitreport todir="target/surefire-reports">
185+
<fileset dir="target/surefire-reports">
186+
<include name="**/*.xml" />
187+
</fileset>
188+
<report format="noframes" todir="target/surefire-reports" />
189+
</junitreport>
190+
</tasks>
191+
</configuration>
192+
<goals>
193+
<goal>run</goal>
194+
</goals>
195+
</execution>
181196
</executions>
182197
<dependencies>
183-
<dependency>
184-
<groupId>org.apache.ant</groupId>
185-
<artifactId>ant-junit</artifactId>
186-
<version>1.8.0</version>
187-
</dependency>
188-
<dependency>
189-
<groupId>org.apache.ant</groupId>
190-
<artifactId>ant-trax</artifactId>
191-
<version>1.8.0</version>
192-
</dependency>
198+
<dependency>
199+
<groupId>org.apache.ant</groupId>
200+
<artifactId>ant-junit</artifactId>
201+
<version>1.8.0</version>
202+
</dependency>
203+
<dependency>
204+
<groupId>org.apache.ant</groupId>
205+
<artifactId>ant-trax</artifactId>
206+
<version>1.8.0</version>
207+
</dependency>
193208
</dependencies>
194209
</plugin>
195210
<plugin>
196211
<groupId>org.apache.maven.plugins</groupId>
197212
<artifactId>maven-surefire-plugin</artifactId>
198213
<version>2.5</version>
199214
<configuration>
200-
<argLine>-Duser.timezone=UTC -XX:MaxPermSize=1024m -Xmx1024m</argLine>
215+
<argLine>-Duser.timezone=UTC -XX:MaxPermSize=1024m -Xmx1024m</argLine>
201216
<skipTests>false</skipTests>
202-
<testFailureIgnore>true</testFailureIgnore>
217+
<testFailureIgnore>true</testFailureIgnore>
203218
<forkMode>once</forkMode>
204219
<includes>
205220
<include>**/*Test.java</include>
@@ -217,59 +232,84 @@
217232
</configuration>
218233
</plugin>
219234
<plugin>
220-
<artifactId>maven-assembly-plugin</artifactId>
235+
<groupId>org.apache.maven.plugins</groupId>
236+
<artifactId>maven-shade-plugin</artifactId>
237+
<version>2.3</version>
221238
<configuration>
222-
<archive>
223-
<manifest>
224-
<mainClass>org.buddycloud.channelserver.Main</mainClass>
225-
</manifest>
226-
</archive>
227-
<descriptorRefs>
228-
<descriptorRef>${project.build.withDependencies}</descriptorRef>
229-
</descriptorRefs>
239+
<outputFile>${project.build.directory}/${project.build.finalName}-${project.build.withDependencies}.jar</outputFile>
240+
<transformers>
241+
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
242+
<mainClass>org.buddycloud.channelserver.Main</mainClass>
243+
</transformer>
244+
</transformers>
230245
</configuration>
231246
<executions>
232247
<execution>
233-
<id>jar-with-dependencies</id>
234248
<phase>package</phase>
235249
<goals>
236-
<goal>single</goal>
250+
<goal>shade</goal>
237251
</goals>
238252
</execution>
239253
</executions>
240254
</plugin>
241255
<plugin>
242-
<groupId>com.github.goldin</groupId>
243-
<artifactId>copy-maven-plugin</artifactId>
244-
<version>0.2.5</version>
245-
<executions>
246-
<execution>
247-
<id>create-archive</id>
248-
<phase>package</phase>
249-
<goals>
250-
<goal>copy</goal>
251-
</goals>
252-
<configuration>
253-
<resources>
254-
<resource>
255-
<targetPath>${project.build.directory}</targetPath>
256-
<file>target/${project.build.finalName}.jar</file>
257-
<destFileName>${project.artifactId}.jar</destFileName>
258-
</resource>
259-
<resource>
260-
<targetPath>${project.build.directory}</targetPath>
261-
<file>${project.build.directory}/${project.build.finalName}-${project.build.withDependencies}.jar</file>
262-
<destFileName>${project.artifactId}-${project.build.withDependencies}.jar</destFileName>
263-
</resource>
264-
</resources>
265-
</configuration>
266-
</execution>
267-
</executions>
256+
<groupId>org.apache.maven.plugins</groupId>
257+
<artifactId>maven-checkstyle-plugin</artifactId>
258+
<configuration>
259+
<failOnViolation>true</failOnViolation>
260+
<failsOnError>true</failsOnError>
261+
<encoding>UTF-8</encoding>
262+
<consoleOutput>false</consoleOutput>
263+
<linkXRef>false</linkXRef>
264+
<includes>**\/*.java</includes>
265+
<includeResources>false</includeResources>
266+
</configuration>
267+
<version>${maven.checkstyle.plugin.version}</version>
268+
<executions>
269+
<execution>
270+
<id>validate</id>
271+
<phase>validate</phase>
272+
<goals>
273+
<goal>check</goal>
274+
</goals>
275+
</execution>
276+
</executions>
277+
</plugin>
278+
<plugin>
279+
<groupId>org.codehaus.mojo</groupId>
280+
<artifactId>cobertura-maven-plugin</artifactId>
281+
<version>2.6</version>
282+
</plugin>
283+
<plugin>
284+
<groupId>org.eluder.coveralls</groupId>
285+
<artifactId>coveralls-maven-plugin</artifactId>
286+
<version>2.2.0</version>
287+
<configuration>
288+
<format>xml</format>
289+
<maxmem>256m</maxmem>
290+
<aggregate>true</aggregate>
291+
<sourceEncoding>UTF-8</sourceEncoding>
292+
<serviceName>travis-ci</serviceName>
293+
</configuration>
268294
</plugin>
269295
</plugins>
296+
</pluginManagement>
270297
</build>
271-
<properties>
272-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
273-
<project.build.withDependencies>jar-with-dependencies</project.build.withDependencies>
274-
</properties>
298+
299+
<reporting>
300+
<plugins>
301+
<plugin>
302+
<groupId>org.codehaus.mojo</groupId>
303+
<artifactId>cobertura-maven-plugin</artifactId>
304+
<version>2.6</version>
305+
<configuration>
306+
<formats>
307+
<format>html</format>
308+
<format>xml</format>
309+
</formats>
310+
</configuration>
311+
</plugin>
312+
</plugins>
313+
</reporting>
314+
275315
</project>

0 commit comments

Comments
 (0)