Skip to content

Changes in this commit are primarily for Java 9 or newer. #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shroffk merged 1 commit into from
Jun 19, 2018
Merged

Changes in this commit are primarily for Java 9 or newer. #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,7 @@ buildNumber.properties
.mvn/timing.properties
nbactions.xml
.settings
.project
.project

# For all you Mac OS users out there
**/.DS_Store
23 changes: 12 additions & 11 deletions bundleJava/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,16 +309,16 @@
<build>
<plugins>

<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>2.8</version>
</dependency>
</dependencies>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>2.8</version>
</dependency>
</dependencies>
</plugin>

<plugin>
Expand All @@ -335,6 +335,7 @@
<configuration>
<finalName>${releaseName}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<tarLongFileMode>posix</tarLongFileMode>
<descriptors>
<descriptor>src/assembly/distribution.xml</descriptor>
</descriptors>
Expand Down Expand Up @@ -363,4 +364,4 @@

</plugins>
</build>
</project>
</project>
2 changes: 1 addition & 1 deletion exampleJava
Open in desktop
Submodule exampleJava updated 22 files
+9 −0 documentation/RELEASE_NOTES.md
+217 −78 documentation/exampleClient.html
+50 −82 documentation/exampleLink.html
+1 −1 exampleClient/scripts/get
+1 −1 exampleClient/scripts/get.bat
+1 −1 exampleClient/scripts/monitor
+1 −1 exampleClient/scripts/monitor.bat
+1 −0 exampleClient/scripts/put
+3 −0 exampleClient/scripts/put.bat
+1 −0 exampleClient/scripts/putGet
+3 −0 exampleClient/scripts/putGet.bat
+222 −0 exampleClient/src/org/epics/exampleJava/exampleClient/Get.java
+0 −114 exampleClient/src/org/epics/exampleJava/exampleClient/GetForever.java
+276 −0 exampleClient/src/org/epics/exampleJava/exampleClient/Monitor.java
+0 −125 exampleClient/src/org/epics/exampleJava/exampleClient/MonitorForever.java
+312 −0 exampleClient/src/org/epics/exampleJava/exampleClient/Put.java
+0 −113 exampleClient/src/org/epics/exampleJava/exampleClient/PutForever.java
+344 −0 exampleClient/src/org/epics/exampleJava/exampleClient/PutGet.java
+162 −19 exampleLink/src/org/epics/exampleJava/exampleLink/ExampleGetLinkRecord.java
+35 −14 exampleLink/src/org/epics/exampleJava/exampleLink/ExampleLinkMain.java
+136 −20 exampleLink/src/org/epics/exampleJava/exampleLink/ExampleMonitorLinkRecord.java
+145 −12 exampleLink/src/org/epics/exampleJava/exampleLink/ExamplePutLinkRecord.java
1 change: 1 addition & 0 deletions normativeTypesJava/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
/target/
documentation/html
/bin/
80 changes: 64 additions & 16 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<epics-pvdatabase.version>4.3.0-SNAPSHOT</epics-pvdatabase.version>
<jca.version>2.3.7-SNAPSHOT</jca.version>
<!-- Versions of examples bundled with Core -->

<!-- Name of javadoc overview page -->
<mainpage.name>${project.name}</mainpage.name>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -110,6 +110,14 @@
<role>developer</role>
</roles>
</developer>
<developer>
<name>Georg Weiss</name>
<email>georgweiss@esss.se</email>
<organization>European Spallation Source</organization>
<roles>
<role>developer</role>
</roles>
</developer>
</developers>

<distributionManagement>
Expand Down Expand Up @@ -263,7 +271,7 @@
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<goals>
<goals>
<goal>manifest</goal>
</goals>
</execution>
Expand All @@ -274,9 +282,9 @@
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<configuration>
<archive>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</archive>
</configuration>
</plugin>

Expand Down Expand Up @@ -308,7 +316,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.0-M1</version>
<version>3.0.1</version>
<configuration>
<overview>documentation/${mainpage.name}.html</overview>
</configuration>
Expand All @@ -322,16 +330,16 @@
</executions>
</plugin>

<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>2.8</version>
</dependency>
</dependencies>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<dependencies>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
<version>2.8</version>
</dependency>
</dependencies>
</plugin>

<plugin>
Expand All @@ -351,7 +359,7 @@

<profiles>

<profile>
<profile>
<id>with-examples</id>
<activation>
<activeByDefault>true</activeByDefault>
Expand Down Expand Up @@ -384,6 +392,46 @@
</build>
</profile>

<profile>
<id>java-9+</id>
<activation>
<jdk>[9,)</jdk>
</activation>
<modules>
<module>directoryService</module>
<module>exampleJava</module>
<module>bundleJava</module>
</modules>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<overview>documentation/${mainpage.name}.html</overview>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.7</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<additionalOptions>-html5</additionalOptions>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
6 changes: 3 additions & 3 deletions pvAccessJava/documentation/pvAccessJava.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ <h1>EPICS pvAccessJava</h1>
<h2 class="nocount">Release 4.0.2, 10-Nov-2014</h2>
<dl>
<dt>Editors:</dt>
<dd>Marty Kraimer, BNL<br />
<dd>Marty Kraimer, BNL<br>
Matej Sekoranja, CosyLab</dd>
</dl>

<h2 class="nocount">Abstract</h2>

<p>pvAccessJava is the Java implementation of pvAccess, which is one of a
related set of products:<br />
related set of products:<br>
<a href="http://epics-pvdata.sourceforge.net/relatedDocumentsV4.html">relatedDocumentsV4.html</a>
</p>

Expand Down Expand Up @@ -304,7 +304,7 @@ <h4>Implementation of ChannelGetRequester:</h4>
The implementation above issues actual get request on success by calling
"channelGet.get()".
User can always destroy a request by calling
"channelGet.destroy()".<br />
"channelGet.destroy()".<br>
ChannelGetRequester.getDone gets called on get operation completion.
On success indicated by status parameter, pvStructure holds the latest data.</p>

Expand Down
Loading