Skip to content

Commit d8d8b24

Browse files
gselzerctrueden
gselzer
authored and
ctrueden
committed
Remove Ops connotation from Scijava Discovery
It is unfortunate to make this change on this branch, but after writing SciJava Ops ServiceLoader, it became clear that SciJava Ops Discovery has nothing to do with Ops. Thus it becomes SciJava Discovery (without the "Ops). SciJava Ops ServiceLoader, however, needs the Ops name because of its module-info.java
1 parent b44cc06 commit d8d8b24

25 files changed

Lines changed: 39 additions & 42 deletions

File tree

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@
4747
<modules>
4848
<module>imagej/imagej-ops2</module>
4949
<module>imagej/imagej-testutil</module>
50-
<module>scijava/scijava-persist</module>
50+
<module>scijava/scijava-discovery</module>
5151
<module>scijava/scijava-function</module>
5252
<module>scijava/scijava-ops-api</module>
53-
<module>scijava/scijava-ops-discovery</module>
5453
<module>scijava/scijava-ops-engine</module>
5554
<module>scijava/scijava-ops-serviceloader</module>
5655
<module>scijava/scijava-ops-spi</module>
56+
<module>scijava/scijava-persist</module>
5757
<module>scijava/scijava-struct</module>
5858
<module>scijava/scijava-taglets</module>
5959
<module>scijava/scijava-testutil</module>

‎scijava/scijava-discovery/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/.apt_generated/
2+
/.apt_generated_tests/

scijava/scijava-ops-discovery/LICENSE.txt renamed to scijava/scijava-discovery/LICENSE.txt

File renamed without changes.

scijava/scijava-ops-discovery/README.md renamed to scijava/scijava-discovery/README.md

File renamed without changes.

scijava/scijava-ops-discovery/bin/generate.groovy renamed to scijava/scijava-discovery/bin/generate.groovy

File renamed without changes.

scijava/scijava-ops-discovery/pom.xml renamed to scijava/scijava-discovery/pom.xml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
<relativePath>../..</relativePath>
1212
</parent>
1313

14-
<artifactId>scijava-ops-discovery</artifactId>
14+
<artifactId>scijava-discovery</artifactId>
1515

16-
<name>SciJava Ops Discovery</name>
17-
<description>SciJava Operations Discovery: Discovery mechanisms used by the SciJava Operations framework.</description>
18-
<url>https://github.com/scijava/scijava-ops-discovery</url>
16+
<name>SciJava Discovery</name>
17+
<description>SciJava Discovery: Discovery mechanisms used by the SciJava Framework.</description>
18+
<url>https://github.com/scijava/scijava-discovery</url>
1919
<inceptionYear>2021</inceptionYear>
2020
<organization>
2121
<name>SciJava</name>
@@ -78,7 +78,7 @@
7878
<mailingLists>
7979
<mailingList>
8080
<name>Image.sc Forum</name>
81-
<archive>https://forum.image.sc/tags/scijava-ops-discovery</archive>
81+
<archive>https://forum.image.sc/tags/scijava-discovery</archive>
8282
</mailingList>
8383
</mailingLists>
8484

@@ -90,22 +90,21 @@
9090
</scm>
9191
<issueManagement>
9292
<system>GitHub Issues</system>
93-
<url>https://github.com/scijava/scijava-ops-discovery/issues</url>
93+
<url>https://github.com/scijava/scijava-discovery/issues</url>
9494
</issueManagement>
9595
<ciManagement>
9696
<system>Travis CI</system>
9797
<url>https://travis-ci.com/scijava/incubator</url>
9898
</ciManagement>
9999

100100
<properties>
101-
<main-class>org.scijava.ops.discovery.Main</main-class>
102-
<package-name>org.scijava.ops.discovery</package-name>
101+
<main-class>org.scijava.discovery.Main</main-class>
102+
<package-name>org.scijava.discovery</package-name>
103103

104104
<license.licenseName>bsd_2</license.licenseName>
105105
<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
106-
<!-- <enforcer.skip>true</enforcer.skip>-->
107-
<scijava-ops-discovery.allowedDuplicateClasses>${scijava.allowedDuplicateClasses},com.github.therapi.runtimejavadoc.repack.com.eclipsesource.json.*</scijava-ops-discovery.allowedDuplicateClasses>
108-
<allowedDuplicateClasses>${scijava-ops-discovery.allowedDuplicateClasses}</allowedDuplicateClasses>
106+
<scijava-discovery.allowedDuplicateClasses>${scijava.allowedDuplicateClasses},com.github.therapi.runtimejavadoc.repack.com.eclipsesource.json.*</scijava-discovery.allowedDuplicateClasses>
107+
<allowedDuplicateClasses>${scijava-discovery.allowedDuplicateClasses}</allowedDuplicateClasses>
109108
</properties>
110109
<dependencies>
111110
</dependencies>

‎scijava/scijava-discovery/src/main/java/module-info.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module org.scijava.discovery {
2+
3+
exports org.scijava.discovery;
4+
5+
}

scijava/scijava-ops-discovery/src/main/java/org/scijava/ops/discovery/Discoverer.java renamed to scijava/scijava-discovery/src/main/java/org/scijava/discovery/Discoverer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
package org.scijava.ops.discovery;
2+
package org.scijava.discovery;
33

44
import java.util.List;
55

scijava/scijava-ops-discovery/src/main/java/org/scijava/ops/discovery/Implementation.java renamed to scijava/scijava-discovery/src/main/java/org/scijava/discovery/Implementation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.scijava.ops.discovery;
1+
package org.scijava.discovery;
22

33
import java.lang.reflect.Type;
44

scijava/scijava-ops-discovery/src/main/java/org/scijava/ops/discovery/StaticDiscoverer.java renamed to scijava/scijava-discovery/src/main/java/org/scijava/discovery/StaticDiscoverer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
package org.scijava.ops.discovery;
2+
package org.scijava.discovery;
33

44
import java.util.HashMap;
55
import java.util.List;

0 commit comments

Comments
 (0)