Skip to content

Commit 7545da0

Browse files
ctruedenctrueden
committed
Restructure as a multimodule project
This will let us develop each piece of scijava in a more isolated way, to avoid unintentional interdependencies.
1 parent 55c972d commit 7545da0

File tree

103 files changed

+7374
-196
lines changed

Some content is hidden

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

103 files changed

+7374
-196
lines changed

‎.gitignore‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Maven #
2-
/target/
2+
target/
33

44
# Eclipse #
5-
/.classpath
6-
/.project
7-
/.settings/
5+
.classpath
6+
.project
7+
.settings/

‎README.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
This project will house the general, non-image-specific core, which currently
2-
resides in [ImageJ Ops](https://github.com/imagej/imagej-ops).
3-
4-
For now, work proceeds on topic branches, until things stabilize enough for a
5-
0.1.0 release!
1+
Next iteration of SciJava core modules.
2+
AKA the artist formerly known as scijava-common.

‎context/pom.xml‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>org.scijava</groupId>
7+
<artifactId>pom-scijava-core</artifactId>
8+
<version>0.1.0-SNAPSHOT</version>
9+
</parent>
10+
11+
<artifactId>scijava-context</artifactId>
12+
13+
<name>SciJava Context</name>
14+
<description>SciJava Context</description>
15+
<url>https://github.com/scijava/scijava-ops</url>
16+
<inceptionYear>2014</inceptionYear>
17+
<organization>
18+
<name>SciJava</name>
19+
<url>http://www.scijava.org/</url>
20+
</organization>
21+
<licenses>
22+
<license>
23+
<name>Simplified BSD License</name>
24+
<distribution>repo</distribution>
25+
</license>
26+
</licenses>
27+
28+
<developers>
29+
<developer>
30+
<id>ctrueden</id>
31+
<name>Curtis Rueden</name>
32+
<url>http://imagej.net/User:Rueden</url>
33+
<roles>
34+
<role>founder</role>
35+
<role>lead</role>
36+
<role>developer</role>
37+
<role>debugger</role>
38+
<role>reviewer</role>
39+
<role>support</role>
40+
<role>maintainer</role>
41+
</roles>
42+
</developer>
43+
<developer>
44+
<id>dietzc</id>
45+
<name>Christian Dietz</name>
46+
<url>http://imagej.net/User:Dietzc</url>
47+
<roles>
48+
<role>founder</role>
49+
<role>lead</role>
50+
<role>developer</role>
51+
<role>debugger</role>
52+
<role>reviewer</role>
53+
<role>support</role>
54+
<role>maintainer</role>
55+
</roles>
56+
</developer>
57+
</developers>
58+
<contributors>
59+
<contributor>
60+
<name>None</name>
61+
</contributor>
62+
</contributors>
63+
64+
<mailingLists>
65+
<mailingList>
66+
<name>SciJava</name>
67+
<subscribe>https://groups.google.com/group/scijava</subscribe>
68+
<unsubscribe>https://groups.google.com/group/scijava</unsubscribe>
69+
<post>scijava@googlegroups.com</post>
70+
<archive>https://groups.google.com/group/scijava</archive>
71+
</mailingList>
72+
</mailingLists>
73+
74+
<scm>
75+
<connection>scm:git:git://github.com/scijava/scijava-ops</connection>
76+
<developerConnection>scm:git:git@github.com:scijava/scijava-ops</developerConnection>
77+
<tag>HEAD</tag>
78+
<url>https://github.com/scijava/scijava-ops</url>
79+
</scm>
80+
<issueManagement>
81+
<system>GitHub Issues</system>
82+
<url>https://github.com/scijava/scijava-ops/issues</url>
83+
</issueManagement>
84+
<ciManagement>
85+
<system>Travis CI</system>
86+
<url>https://travis-ci.org/scijava/scijava-ops</url>
87+
</ciManagement>
88+
89+
<properties>
90+
<license.licenseName>bsd_2</license.licenseName>
91+
<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
92+
</properties>
93+
</project>

‎ops-examples/README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
This project will house the general, non-image-specific core, which currently
2+
resides in [ImageJ Ops](https://github.com/imagej/imagej-ops).
3+
4+
For now, work proceeds on topic branches, until things stabilize enough for a
5+
0.1.0 release!

‎ops-examples/pom.xml‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>org.scijava</groupId>
7+
<artifactId>pom-scijava-core</artifactId>
8+
<version>0.1.0-SNAPSHOT</version>
9+
</parent>
10+
11+
<artifactId>scijava-ops-examples</artifactId>
12+
13+
<name>SciJava Ops</name>
14+
<description>SciJava Ops</description>
15+
<url>https://github.com/scijava/scijava-ops</url>
16+
<inceptionYear>2014</inceptionYear>
17+
<organization>
18+
<name>SciJava</name>
19+
<url>http://www.scijava.org/</url>
20+
</organization>
21+
<licenses>
22+
<license>
23+
<name>Simplified BSD License</name>
24+
<distribution>repo</distribution>
25+
</license>
26+
</licenses>
27+
28+
<developers>
29+
<developer>
30+
<id>ctrueden</id>
31+
<name>Curtis Rueden</name>
32+
<url>http://imagej.net/User:Rueden</url>
33+
<roles>
34+
<role>founder</role>
35+
<role>lead</role>
36+
<role>developer</role>
37+
<role>debugger</role>
38+
<role>reviewer</role>
39+
<role>support</role>
40+
<role>maintainer</role>
41+
</roles>
42+
</developer>
43+
<developer>
44+
<id>dietzc</id>
45+
<name>Christian Dietz</name>
46+
<url>http://imagej.net/User:Dietzc</url>
47+
<roles>
48+
<role>founder</role>
49+
<role>lead</role>
50+
<role>developer</role>
51+
<role>debugger</role>
52+
<role>reviewer</role>
53+
<role>support</role>
54+
<role>maintainer</role>
55+
</roles>
56+
</developer>
57+
</developers>
58+
<contributors>
59+
<contributor>
60+
<name>None</name>
61+
</contributor>
62+
</contributors>
63+
64+
<mailingLists>
65+
<mailingList>
66+
<name>SciJava</name>
67+
<subscribe>https://groups.google.com/group/scijava</subscribe>
68+
<unsubscribe>https://groups.google.com/group/scijava</unsubscribe>
69+
<post>scijava@googlegroups.com</post>
70+
<archive>https://groups.google.com/group/scijava</archive>
71+
</mailingList>
72+
</mailingLists>
73+
74+
<scm>
75+
<connection>scm:git:git://github.com/scijava/scijava-ops</connection>
76+
<developerConnection>scm:git:git@github.com:scijava/scijava-ops</developerConnection>
77+
<tag>HEAD</tag>
78+
<url>https://github.com/scijava/scijava-ops</url>
79+
</scm>
80+
<issueManagement>
81+
<system>GitHub Issues</system>
82+
<url>https://github.com/scijava/scijava-ops/issues</url>
83+
</issueManagement>
84+
<ciManagement>
85+
<system>Travis CI</system>
86+
<url>https://travis-ci.org/scijava/scijava-ops</url>
87+
</ciManagement>
88+
89+
<properties>
90+
<license.licenseName>bsd_2</license.licenseName>
91+
<license.copyrightOwners>SciJava developers.</license.copyrightOwners>
92+
</properties>
93+
94+
<dependencies>
95+
<dependency>
96+
<groupId>org.scijava</groupId>
97+
<artifactId>scijava-ops</artifactId>
98+
<version>${project.version}</version>
99+
</dependency>
100+
<dependency>
101+
<groupId>org.scijava</groupId>
102+
<artifactId>scijava-param</artifactId>
103+
<version>${project.version}</version>
104+
</dependency>
105+
<dependency>
106+
<groupId>org.scijava</groupId>
107+
<artifactId>scijava-util</artifactId>
108+
<version>${project.version}</version>
109+
</dependency>
110+
</dependencies>
111+
</project>

src/main/java/org/scijava/ops/examples/FeatureStruct.java renamed to ops-examples/src/main/java/org/scijava/ops/examples/FeatureStruct.java

File renamed without changes.

src/main/java/org/scijava/ops/examples/ImageToFeatureList.java renamed to ops-examples/src/main/java/org/scijava/ops/examples/ImageToFeatureList.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33

44
import org.scijava.ops.FunctionOp;
55
import org.scijava.param.Parameter;
6-
import org.scijava.plugin.Plugin;
76
import org.scijava.util.DoubleArray;
87

98
/**
109
* Takes a list of doubles as inputs; produces some statistics as output.
1110
*/
12-
@Plugin(type = FunctionOp.class)
1311
public class ImageToFeatureList implements
1412
FunctionOp<DoubleArray, ImageToFeatureList.Features>
1513
{

src/main/java/org/scijava/ops/examples/MyBiFunctionOp.java renamed to ops-examples/src/main/java/org/scijava/ops/examples/MyBiFunctionOp.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44

55
import org.scijava.ops.BiFunctionOp;
66
import org.scijava.param.Parameter;
7-
import org.scijava.plugin.Plugin;
87

9-
@Plugin(type = BiFunctionOp.class)
108
@Parameter(key = "image")
119
@Parameter(key = "settings")
1210
@Parameter(key = "result")

src/main/java/org/scijava/ops/examples/NCommands.java renamed to ops-examples/src/main/java/org/scijava/ops/examples/NCommands.java

File renamed without changes.

src/main/java/org/scijava/ops/examples/Square.java renamed to ops-examples/src/main/java/org/scijava/ops/examples/Square.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
import org.scijava.ops.ComputerOp;
44
import org.scijava.ops.OutputAware;
5-
import org.scijava.plugin.Plugin;
65
import org.scijava.util.DoubleArray;
76

87
/** Unary computer/function hybrid. */
9-
@Plugin(type = ComputerOp.class)
108
public class Square implements ComputerOp<DoubleArray, DoubleArray>, OutputAware<DoubleArray, DoubleArray> {
119

1210
@Override

0 commit comments

Comments
 (0)