Versioning

.env

@@ -0,0 +1 @@
+project.version="5.0.0-SNAPSHOT"

Dockerfile

@@ -1,18 +1,14 @@
 FROM maven:3.6.0-jdk-11-slim AS build
 
-RUN apt-get update && \
-    apt-get install -y git mongodb
-
 COPY . /webprotege
 
 WORKDIR /webprotege
 
-RUN mkdir -p /data/db \
-    && mongod --fork --syslog \
-    && mvn clean package
-
 FROM tomcat:8-jre11-slim
 
+RUN apt-get update && \
+    apt-get install -y git
+
 RUN rm -rf /usr/local/tomcat/webapps/* \
     && mkdir -p /srv/webprotege \
     && mkdir -p /usr/local/tomcat/webapps/ROOT
@@ -21,10 +17,10 @@ WORKDIR /usr/local/tomcat/webapps/ROOT
 
 # Here WEBPROTEGE_VERSION is coming from the custom build args WEBPROTEGE_VERSION=$DOCKER_TAG hooks/build script.
 # Ref: https://docs.docker.com/docker-hub/builds/advanced/
-ARG WEBPROTEGE_VERSION
+#ARG WEBPROTEGE_VERSION
 
-ENV WEBPROTEGE_VERSION $WEBPROTEGE_VERSION
-COPY --from=build /webprotege/webprotege-cli/target/webprotege-cli-${WEBPROTEGE_VERSION}.jar /webprotege-cli.jar
-COPY --from=build /webprotege/webprotege-server/target/webprotege-server-${WEBPROTEGE_VERSION}.war ./webprotege.war
+#ENV WEBPROTEGE_VERSION $WEBPROTEGE_VERSION
+COPY --from=build /webprotege/webprotege-cli/target/webprotege-cli-5.0.0-SNAPSHOT.jar /webprotege-cli.jar
+COPY --from=build /webprotege/webprotege-server/target/webprotege-server-5.0.0-SNAPSHOT.war ./webprotege.war
 RUN unzip webprotege.war \
     && rm webprotege.war

docker-compose.yml

@@ -1,3 +1,28 @@
+#version: "3"
+
+#services:
+
+#  wpmongo:
+#    container_name: webprotege-mongodb
+#    image: mongo:4.1-bionic
+#    restart: unless-stopped
+#    volumes:
+#      - ./.protegedata/mongodb:/data/db
+
+#  webprotege:
+#    container_name: webprotege
+#    build: .
+#    image: protegeproject/webprotege
+#    depends_on:
+#      - wpmongo
+#    restart: unless-stopped
+#    environment:
+#      - webprotege.mongodb.host=wpmongo
+#    volumes:
+#      - ./.protegedata/protege:/srv/webprotege
+#    ports:
+#      - 5000:8080
+
 version: "3"
 
 services:
@@ -6,18 +31,18 @@ services:
     container_name: webprotege-mongodb
     image: mongo:4.1-bionic
     restart: unless-stopped
-    volumes: 
+    volumes:
       - ./.protegedata/mongodb:/data/db
 
   webprotege:
     container_name: webprotege
-    image: protegeproject/webprotege
+    build: .
     depends_on:
       - wpmongo
     restart: unless-stopped
     environment:
       - webprotege.mongodb.host=wpmongo
-    volumes: 
+    volumes:
     - ./.protegedata/protege:/srv/webprotege
     ports:
       - 5000:8080

pom.xml

@@ -6,12 +6,19 @@
     <groupId>edu.stanford.protege</groupId>
     <artifactId>webprotege</artifactId>
     <version>5.0.0-SNAPSHOT</version>
+    <dependencies>
+        <dependency>
+            <groupId>com.google.gwt</groupId>
+            <artifactId>gwt-user</artifactId>
+        </dependency>
+    </dependencies>
     <packaging>pom</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <guava.version>28.0</guava.version>
         <dagger.version>2.20</dagger.version>
+        <!--<dagger.version>2.15</dagger.version>-->
         <owlapi.version>4.5.13</owlapi.version>
         <widgetmap.version>4.0.1</widgetmap.version>
         <graphtree.version>1.1.1</graphtree.version>
@@ -41,6 +48,17 @@
 
     <dependencyManagement>
         <dependencies>
+
+
+            <!-- https://mvnrepository.com/artifact/com.allen-sauer.gwt.log/gwt-log -->
+            <dependency>
+                <groupId>com.allen-sauer.gwt.log</groupId>
+                <artifactId>gwt-log</artifactId>
+                <version>3.3.2</version>
+            </dependency>
+
+
+
             <dependency>
                 <groupId>com.google.gwt</groupId>
                 <artifactId>gwt</artifactId>
@@ -169,35 +187,35 @@
         </dependencies>
     </dependencyManagement>
 
-    <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-        <repository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-    </distributionManagement>
+<!--    <distributionManagement>-->
+<!--        <snapshotRepository>-->
+<!--            <id>ossrh</id>-->
+<!--            <url>https://oss.sonatype.org/content/repositories/snapshots</url>-->
+<!--        </snapshotRepository>-->
+<!--        <repository>-->
+<!--            <id>ossrh</id>-->
+<!--            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>-->
+<!--        </repository>-->
+<!--    </distributionManagement>-->
 
-    <repositories>
-        <repository>
-            <id>oss-sonatype</id>
-            <name>OSS Sonatype Snapshot Repository</name>
-            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-            <snapshots>
-                <updatePolicy>daily</updatePolicy>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>edu.protege.stanford</id>
-            <name>Protege Project Maven Repo</name>
-            <url>https://github.com/protegeproject/mvn-repo/raw/master/releases</url>
-            <snapshots>
-                <updatePolicy>daily</updatePolicy>
-            </snapshots>
-        </repository>
-    </repositories>
+<!--    <repositories>-->
+<!--        <repository>-->
+<!--            <id>oss-sonatype</id>-->
+<!--            <name>OSS Sonatype Snapshot Repository</name>-->
+<!--            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>-->
+<!--            <snapshots>-->
+<!--                <updatePolicy>daily</updatePolicy>-->
+<!--            </snapshots>-->
+<!--        </repository>-->
+<!--        <repository>-->
+<!--            <id>edu.protege.stanford</id>-->
+<!--            <name>Protege Project Maven Repo</name>-->
+<!--            <url>https://github.com/protegeproject/mvn-repo/raw/master/releases</url>-->
+<!--            <snapshots>-->
+<!--                <updatePolicy>daily</updatePolicy>-->
+<!--            </snapshots>-->
+<!--        </repository>-->
+<!--    </repositories>-->
 
     <build>
 
@@ -426,21 +444,29 @@
         </profile>
         <!-- Profile for deployment of WebProtege to webprotege.stanford.edu -->
         <profile>
-            <id>webprotege.stanford.edu</id>
+            <id>webprotege.tib.eu</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <properties>
                 <!-- Insert the code for google analytics.  This code is not inserted by default. -->
                 <application.analytics>
                     <![CDATA[
-                    <script type="text/javascript">
-                        var _gaq = _gaq || [];
-                        _gaq.push(['_setAccount', 'UA-32498293-1']);
-                        _gaq.push(['_trackPageview']);
-                        (function() {
-                        var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-                        ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-                        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-                        })();
-                    </script>
+<!-- Matomo -->
+<script>
+  var _paq = window._paq = window._paq || [];
+  / tracker methods like "setCustomDimension" should be called before "trackPageView" /
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="//support.tib.eu/piwik/";
+    _paq.push(['setTrackerUrl', u+'piwik.php']);
+    _paq.push(['setSiteId', '43']);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+  })();
+</script>
+<!-- End Matomo Code -->
                     ]]>
                 </application.analytics>
             </properties>
@@ -456,5 +482,8 @@
         <module>webprotege-shared-core</module>
         <module>webprotege-cli</module>
         <module>webprotege-server-lucene</module>
+        <module>webprotege-github</module>
+        <module>webprotege-github-client</module>
+        <module>webprotege-github-server</module>
     </modules>
 </project>