Skip to content

Commit 43f310f

Browse files
author
Arne Georg Gisnås Gleditsch
committed
Mass move from com.comoyo namespace to no.hassle
No functional changes.
1 parent b3a3dc8 commit 43f310f

File tree

65 files changed

+104
-101
lines changed

Some content is hidden

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

65 files changed

+104
-101
lines changed

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
commons
2-
=======
1+
java-commons
2+
============
33

44
This is a collection of Java components that have proven useful across
55
different code repositories, initially in the Telenor Digital (née
6-
Comoyo) Communications group
6+
Comoyo) Communications group.
77

88
The list of components currently reads as follows:
99

‎emjar-demo/README.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ some of the other fat jar alternatives in a Maven flow (which is not
1414
to say that they all represent best practices).
1515

1616
Refer to the [pom](pom.xml) and [source
17-
code](src/main/java/com/comoyo/commons/emjar/demo/Demo.java) for some
17+
code](src/main/java/no/hassle/emjar/demo/Demo.java) for some
1818
comments about the peculiarites of the different alternatives.
1919

2020
Run `mvn clean verify -Dmaven.profile
@@ -121,8 +121,8 @@ by the different tools under different circumstances:
121121
java.security.NoSuchProviderException: JCE cannot authenticate the provider BC
122122
at javax.crypto.JceSecurity.getInstance(JceSecurity.java:100)
123123
at javax.crypto.KeyAgreement.getInstance(KeyAgreement.java:230)
124-
at com.comoyo.commons.emjar.demo.Demo.main(Demo.java:36)
125-
Caused by: java.util.jar.JarException: file:/home/argggh/telenor/src/commons/emjar-demo/target/emjar-demo-1.4-SNAPSHOT-shaded.jar has unsigned entries - jetty-logging.properties
124+
at no.hassle.emjar.demo.Demo.main(Demo.java:36)
125+
Caused by: java.util.jar.JarException: file:/home/argggh/src/java-commons/emjar-demo/target/emjar-demo-2.0-SNAPSHOT-shaded.jar has unsigned entries - jetty-logging.properties
126126
at javax.crypto.JarVerifier.verifySingleJar(JarVerifier.java:500)
127127
at javax.crypto.JarVerifier.verifyJars(JarVerifier.java:361)
128128
at javax.crypto.JarVerifier.verify(JarVerifier.java:289)
@@ -146,8 +146,8 @@ Caused by: java.util.jar.JarException: file:/home/argggh/telenor/src/commons/emj
146146
java.security.NoSuchProviderException: JCE cannot authenticate the provider BC
147147
at javax.crypto.JceSecurity.getInstance(JceSecurity.java:100)
148148
at javax.crypto.KeyAgreement.getInstance(KeyAgreement.java:230)
149-
at com.comoyo.commons.emjar.demo.Demo.main(Demo.java:36)
150-
Caused by: java.util.jar.JarException: file:/home/argggh/telenor/src/commons/emjar-demo/target/emjar-demo-1.4-SNAPSHOT-shaded.jar has unsigned entries - jetty-logging.properties
149+
at no.hassle.emjar.demo.Demo.main(Demo.java:36)
150+
Caused by: java.util.jar.JarException: file:/home/argggh/src/java-commons/emjar-demo/target/emjar-demo-2.0-SNAPSHOT-shaded.jar has unsigned entries - jetty-logging.properties
151151
at javax.crypto.JarVerifier.verifySingleJar(JarVerifier.java:500)
152152
at javax.crypto.JarVerifier.verifyJars(JarVerifier.java:361)
153153
at javax.crypto.JarVerifier.verify(JarVerifier.java:289)
@@ -200,7 +200,7 @@ javax.ws.rs.NotFoundException: HTTP 404 Not Found
200200
at org.glassfish.jersey.client.JerseyInvocation.invoke(JerseyInvocation.java:697)
201201
at org.glassfish.jersey.client.JerseyInvocation$Builder.method(JerseyInvocation.java:420)
202202
at org.glassfish.jersey.client.JerseyInvocation$Builder.get(JerseyInvocation.java:316)
203-
at com.comoyo.commons.emjar.demo.Demo.main(Demo.java:51)
203+
at no.hassle.emjar.demo.Demo.main(Demo.java:51)
204204
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
205205
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
206206
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -235,7 +235,7 @@ Exception in thread "main" java.lang.reflect.InvocationTargetException
235235
at org.springframework.boot.loader.Launcher.launch(Launcher.java:87)
236236
at org.springframework.boot.loader.Launcher.launch(Launcher.java:50)
237237
at org.springframework.boot.loader.JarLauncher.main(JarLauncher.java:51)
238-
Caused by: org.glassfish.jersey.server.internal.scanning.ResourceFinderException: java.io.FileNotFoundException: /home/argggh/telenor/src/commons/emjar-demo/target/emjar-demo-1.4-SNAPSHOT-springboot.jar!/BOOT-INF/classes (No such file or directory)
238+
Caused by: org.glassfish.jersey.server.internal.scanning.ResourceFinderException: java.io.FileNotFoundException: /home/argggh/src/java-commons/emjar-demo/target/emjar-demo-2.0-SNAPSHOT-springboot.jar!/BOOT-INF/classes (No such file or directory)
239239
at org.glassfish.jersey.server.internal.scanning.JarZipSchemeResourceFinderFactory.create(JarZipSchemeResourceFinderFactory.java:89)
240240
at org.glassfish.jersey.server.internal.scanning.JarZipSchemeResourceFinderFactory.create(JarZipSchemeResourceFinderFactory.java:65)
241241
at org.glassfish.jersey.server.internal.scanning.PackageNamesScanner.addResourceFinder(PackageNamesScanner.java:282)
@@ -244,9 +244,9 @@ Caused by: org.glassfish.jersey.server.internal.scanning.ResourceFinderException
244244
at org.glassfish.jersey.server.internal.scanning.PackageNamesScanner.<init>(PackageNamesScanner.java:110)
245245
at org.glassfish.jersey.server.ResourceConfig.packages(ResourceConfig.java:680)
246246
at org.glassfish.jersey.server.ResourceConfig.packages(ResourceConfig.java:660)
247-
at com.comoyo.commons.emjar.demo.Demo.main(Demo.java:27)
247+
at no.hassle.emjar.demo.Demo.main(Demo.java:27)
248248
... 8 more
249-
Caused by: java.io.FileNotFoundException: /home/argggh/telenor/src/commons/emjar-demo/target/emjar-demo-1.4-SNAPSHOT-springboot.jar!/BOOT-INF/classes (No such file or directory)
249+
Caused by: java.io.FileNotFoundException: /home/argggh/src/java-commons/emjar-demo/target/emjar-demo-2.0-SNAPSHOT-springboot.jar!/BOOT-INF/classes (No such file or directory)
250250
at java.io.FileInputStream.open0(Native Method)
251251
at java.io.FileInputStream.open(FileInputStream.java:195)
252252
at java.io.FileInputStream.<init>(FileInputStream.java:138)
@@ -292,7 +292,7 @@ javax.ws.rs.NotFoundException: HTTP 404 Not Found
292292
at org.glassfish.jersey.client.JerseyInvocation.invoke(JerseyInvocation.java:697)
293293
at org.glassfish.jersey.client.JerseyInvocation$Builder.method(JerseyInvocation.java:420)
294294
at org.glassfish.jersey.client.JerseyInvocation$Builder.get(JerseyInvocation.java:316)
295-
at com.comoyo.commons.emjar.demo.Demo.main(Demo.java:51)
295+
at no.hassle.emjar.demo.Demo.main(Demo.java:51)
296296
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
297297
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
298298
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -303,7 +303,7 @@ javax.ws.rs.NotFoundException: HTTP 404 Not Found
303303
[INFO]
304304
[INFO] --- exec-maven-plugin:1.4.0:exec (fencepost) @ emjar-demo ---
305305
306-
com.comoyo.commons:emjar-demo:1.4-SNAPSHOT
306+
no.hassle.commons:emjar-demo:2.0-SNAPSHOT
307307
308308
clean 89ms
309309
org.apache.maven.plugins:maven-clean-plugin:2.5 (default-clean) 85ms
@@ -339,7 +339,7 @@ com.comoyo.commons:emjar-demo:1.4-SNAPSHOT
339339
package 7s 48ms
340340
org.apache.maven.plugins:maven-source-plugin:2.4 (attach-sources) 168ms
341341
org.apache.maven.plugins:maven-javadoc-plugin:2.10.3 (attach-javadocs) 1s 897ms
342-
com.comoyo.commons:emjar-maven-plugin:1.4-SNAPSHOT (package-emjar) 407ms
342+
no.hassle.commons:emjar-maven-plugin:2.0-SNAPSHOT (package-emjar) 407ms
343343
org.apache.maven.plugins:maven-shade-plugin:2.4.3 (package-shade) 1s 851ms
344344
org.apache.maven.plugins:maven-assembly-plugin:2.4 (package-onejar) 1s 827ms
345345
org.apache.maven.plugins:maven-assembly-plugin:2.4 (package-jarinjar) 599ms

‎emjar-demo/pom.xml

+11-7
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44

55
<parent>
66
<artifactId>commons</artifactId>
7-
<groupId>com.comoyo</groupId>
8-
<version>1.4-SNAPSHOT</version>
7+
<groupId>no.hassle</groupId>
8+
<version>2.0-SNAPSHOT</version>
99
</parent>
1010

1111
<name>emjar-demo</name>
12-
<groupId>com.comoyo.commons</groupId>
12+
<groupId>no.hassle.commons</groupId>
1313
<artifactId>emjar-demo</artifactId>
1414

15-
<url>https://github.com/comoyo/commons/tree/master/emjar-demo</url>
15+
<url>https://github.com/no-hassle/java-commons/tree/master/emjar-demo</url>
1616
<packaging>jar</packaging>
1717

1818
<properties>
1919
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
20-
<main.class>com.comoyo.commons.emjar.demo.Demo</main.class>
20+
<main.class>no.hassle.emjar.demo.Demo</main.class>
2121
<jetty.version>9.3.15.v20161220</jetty.version>
2222
<jersey.version>2.25</jersey.version>
2323
<jackson.version>2.8.6</jackson.version>
@@ -110,7 +110,7 @@
110110
</manifest>
111111
<manifestEntries>
112112
<Implementation-Title>${project.name}</Implementation-Title>
113-
<Implementation-Vendor>com.telenordigital</Implementation-Vendor>
113+
<Implementation-Vendor>no.hassle</Implementation-Vendor>
114114
<Implementation-Version>${project.artifactId}-${project.version}</Implementation-Version>
115115
</manifestEntries>
116116
</archive>
@@ -216,7 +216,7 @@
216216
<build>
217217
<plugins>
218218
<plugin>
219-
<groupId>com.comoyo.commons</groupId>
219+
<groupId>no.hassle.maven.plugins</groupId>
220220
<artifactId>emjar-maven-plugin</artifactId>
221221
<version>${project.version}</version>
222222
<executions>
@@ -642,6 +642,10 @@
642642
<argument>-jar</argument>
643643
<argument>emjar-demo-${project.version}-jarinjar.jar</argument>
644644
</arguments>
645+
<successCodes>
646+
<successCode>0</successCode>
647+
<successCode>1</successCode>
648+
</successCodes>
645649
</configuration>
646650
</execution>
647651
</executions>

‎emjar-demo/src/main/java/com/comoyo/commons/emjar/demo/Demo.java ‎emjar-demo/src/main/java/no/hassle/emjar/demo/Demo.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.comoyo.commons.emjar.demo;
1+
package no.hassle.emjar.demo;
22

3-
import com.comoyo.commons.emjar.demo.rs.Endpoint;
3+
import no.hassle.emjar.demo.rs.Endpoint;
44
import java.net.URI;
55
import java.security.NoSuchProviderException;
66
import java.security.Security;
@@ -23,7 +23,7 @@ public static void main(final String[] args) throws Exception {
2323
final ResourceConfig app = new ResourceConfig();
2424
if (System.getProperty("emjar.demo.classpath-scanning") != null) {
2525
log.info("Running test (classpath scanning)");
26-
app.packages("com.comoyo.commons.emjar.demo.rs");
26+
app.packages("no.hassle.emjar.demo.rs");
2727
} else {
2828
log.info("Running test (explicit registration)");
2929
app.register(Endpoint.class);

‎emjar-demo/src/main/java/com/comoyo/commons/emjar/demo/rs/Endpoint.java ‎emjar-demo/src/main/java/no/hassle/emjar/demo/rs/Endpoint.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.comoyo.commons.emjar.demo.rs;
1+
package no.hassle.emjar.demo.rs;
22

33
import java.util.HashMap;
44
import java.util.Map;

‎emjar-maven-plugin/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ Maven Plugin Mojo for building bundling jars that contain dependency artifact ja
4848
<plugins>
4949
...
5050
<plugin>
51-
<groupId>com.comoyo.commons</groupId>
51+
<groupId>no.hassle.maven.plugins</groupId>
5252
<artifactId>emjar-maven-plugin</artifactId>
53-
<version>1.4.60</version>
53+
<version>2.0.0</version>
5454
<executions>
5555
<execution>
5656
<goals>
@@ -69,9 +69,9 @@ Maven Plugin Mojo for building bundling jars that contain dependency artifact ja
6969
<plugins>
7070
...
7171
<plugin>
72-
<groupId>com.comoyo.commons</groupId>
72+
<groupId>no.hassle.maven.plugins</groupId>
7373
<artifactId>emjar-maven-plugin</artifactId>
74-
<version>1.4.60</version>
74+
<version>2.0.0</version>
7575
<executions>
7676
<execution>
7777
<goals>

‎emjar-maven-plugin/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
<parent>
99
<artifactId>commons</artifactId>
10-
<groupId>com.comoyo</groupId>
11-
<version>1.4-SNAPSHOT</version>
10+
<groupId>no.hassle</groupId>
11+
<version>2.0-SNAPSHOT</version>
1212
</parent>
1313

1414
<name>emjar-maven-plugin -- for building executable embedded jar files</name>
15-
<groupId>com.comoyo.commons</groupId>
15+
<groupId>no.hassle.maven.plugins</groupId>
1616
<artifactId>emjar-maven-plugin</artifactId>
1717

18-
<url>https://github.com/comoyo/commons/tree/master/emjar-maven-plugin</url>
18+
<url>https://github.com/no-hassle/java-commons/tree/master/emjar-maven-plugin</url>
1919
<packaging>maven-plugin</packaging>
2020

2121
<prerequisites>
@@ -36,7 +36,7 @@
3636
</dependency>
3737

3838
<dependency>
39-
<groupId>com.comoyo.commons</groupId>
39+
<groupId>no.hassle.commons</groupId>
4040
<artifactId>emjar</artifactId>
4141
<version>${project.version}</version>
4242
</dependency>

‎emjar-maven-plugin/src/main/java/com/comoyo/maven/plugins/emjar/EmJarMojo.java ‎emjar-maven-plugin/src/main/java/no/hassle/maven/plugins/emjar/EmJarMojo.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.comoyo.maven.plugins.emjar;
17+
package no.hassle.maven.plugins.emjar;
1818

19-
import com.comoyo.emjar.Boot;
19+
import no.hassle.emjar.Boot;
2020
import com.google.common.io.ByteStreams;
2121

2222
import org.apache.maven.artifact.Artifact;
@@ -283,7 +283,7 @@ private Artifact getEmJarArtifact()
283283
{
284284
final Artifact artifact
285285
= repositorySystem.createArtifact(
286-
pluginDescriptor.getGroupId(),
286+
"no.hassle.commons",
287287
"emjar",
288288
pluginDescriptor.getVersion(),
289289
"jar");

‎emjar-maven-plugin/src/main/java/com/comoyo/maven/plugins/emjar/Ordering.java ‎emjar-maven-plugin/src/main/java/no/hassle/maven/plugins/emjar/Ordering.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.comoyo.maven.plugins.emjar;
17+
package no.hassle.maven.plugins.emjar;
1818

1919
public class Ordering
2020
{

‎emjar-maven-plugin/src/test/java/com/comoyo/maven/plugins/emjar/EmJarMojoTest.java ‎emjar-maven-plugin/src/test/java/no/hassle/maven/plugins/emjar/EmJarMojoTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.comoyo.maven.plugins.emjar;
17+
package no.hassle.maven.plugins.emjar;
1818

1919
import org.apache.maven.artifact.Artifact;
2020
import org.apache.maven.artifact.DefaultArtifact;

‎emjar/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
<parent>
99
<artifactId>commons</artifactId>
10-
<groupId>com.comoyo</groupId>
11-
<version>1.4-SNAPSHOT</version>
10+
<groupId>no.hassle</groupId>
11+
<version>2.0-SNAPSHOT</version>
1212
</parent>
1313

1414
<name>emjar -- for loading dependencies from embedded jar files</name>
15-
<groupId>com.comoyo.commons</groupId>
15+
<groupId>no.hassle.commons</groupId>
1616
<artifactId>emjar</artifactId>
1717

18-
<url>https://github.com/comoyo/commons/tree/master/emjar</url>
18+
<url>https://github.com/no-hassle/java-commons/tree/master/emjar</url>
1919
<packaging>jar</packaging>
2020

2121
<build>

‎emjar/src/main/java/com/comoyo/emjar/Boot.java ‎emjar/src/main/java/no/hassle/emjar/Boot.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.comoyo.emjar;
17+
package no.hassle.emjar;
1818

1919
import java.io.IOException;
2020
import java.io.InputStream;
@@ -35,7 +35,7 @@
3535
* <ul>
3636
* <li>Configure the bundle jar file's manifest attribute
3737
* <strong><code>Main-Class</code></strong> as
38-
* <strong><code>com.comoyo.emjar.Boot</code></strong>.</li>
38+
* <strong><code>no.hassle.emjar.Boot</code></strong>.</li>
3939
*
4040
* <li>Specify the actual main class using the
4141
* <strong><code>EmJar-Main-Class</code></strong> manifest attribute

‎emjar/src/main/java/com/comoyo/emjar/ByteBufferBackedInputStream.java ‎emjar/src/main/java/no/hassle/emjar/ByteBufferBackedInputStream.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.comoyo.emjar;
17+
package no.hassle.emjar;
1818

1919
import java.io.IOException;
2020
import java.io.InputStream;

‎emjar/src/main/java/com/comoyo/emjar/EmJarClassLoader.java ‎emjar/src/main/java/no/hassle/emjar/EmJarClassLoader.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.comoyo.emjar;
17+
package no.hassle.emjar;
1818

1919
import java.net.JarURLConnection;
2020
import java.net.MalformedURLException;
@@ -51,7 +51,7 @@
5151
* The EmJar class loader can be invoked by setting the system
5252
* property <strong><code>java.system.class.loader</code></strong> to
5353
* the value
54-
* <strong><code>com.comoyo.emjar.EmJarClassLoader</code></strong>,
54+
* <strong><code>no.hassle.emjar.EmJarClassLoader</code></strong>,
5555
* e.g by using the <strong><code>-D</code></strong> flag to the
5656
* <strong><code>java</code></strong> executable. (The emjar classes
5757
* must for obvious reasons be stored directly inside the bundle jar;

‎emjar/src/main/java/com/comoyo/emjar/IteratorBackedEnumeration.java ‎emjar/src/main/java/no/hassle/emjar/IteratorBackedEnumeration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.comoyo.emjar;
17+
package no.hassle.emjar;
1818

1919
import java.util.Enumeration;
2020
import java.util.Iterator;

‎emjar/src/main/java/com/comoyo/emjar/OndemandEmbeddedJar.java ‎emjar/src/main/java/no/hassle/emjar/OndemandEmbeddedJar.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.comoyo.emjar;
17+
package no.hassle.emjar;
1818

1919
import java.io.ByteArrayInputStream;
2020
import java.io.IOException;

‎emjar/src/main/java/com/comoyo/emjar/PreloadedEmbeddedJar.java ‎emjar/src/main/java/no/hassle/emjar/PreloadedEmbeddedJar.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.comoyo.emjar;
17+
package no.hassle.emjar;
1818

1919
import java.io.ByteArrayInputStream;
2020
import java.io.IOException;

‎emjar/src/main/java/com/comoyo/emjar/ZipScanner.java ‎emjar/src/main/java/no/hassle/emjar/ZipScanner.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.comoyo.emjar;
17+
package no.hassle.emjar;
1818

1919
import java.io.File;
2020
import java.io.IOException;

‎emjar/src/test/java/com/comoyo/emjar/BootTest.java ‎emjar/src/test/java/no/hassle/emjar/BootTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.comoyo.emjar;
17+
package no.hassle.emjar;
1818

1919
import java.io.File;
2020
import java.lang.reflect.Method;

‎emjar/src/test/java/com/comoyo/emjar/EmJarClassLoaderTest.java ‎emjar/src/test/java/no/hassle/emjar/EmJarClassLoaderTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.comoyo.emjar;
17+
package no.hassle.emjar;
1818

1919
import java.io.BufferedReader;
2020
import java.io.File;

0 commit comments

Comments
 (0)