Permalink
Browse files

Changed java package name to org.totalgrid.dnp3

  • Loading branch information...
1 parent 458cf8d commit 4c940002d70315f3f67d18c5831dc0d7723092ab @devans devans committed May 17, 2013
View
@@ -37,8 +37,9 @@ DNP.suo
JavaDNP3.cpp
JavaDNP3.h
/DNP3Java/jar
-/DNP3Java/src
+/DNP3Java/src/main
/DNP3Java/target
+/DNP3Java/out
/TestSet/*.xml
/coverage-*
/doc
View
@@ -1,8 +1,8 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.totalgrid.reef.protocol.dnp3</groupId>
- <artifactId>dnp3java</artifactId>
+ <groupId>org.totalgrid.dnp3</groupId>
+ <artifactId>opendnp3</artifactId>
<packaging>jar</packaging>
<version>1.1.0-SNAPSHOT</version>
@@ -16,14 +16,14 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.totalgrid.reef.protocol.dnp3
+package org.totalgrid.dnp3
-import org.totalgrid.reef.protocol.dnp3.mock._
import org.scalatest.matchers.ShouldMatchers
import org.scalatest.junit.JUnitRunner
import org.junit.runner.RunWith
import org.scalatest.FunSuite
+import org.totalgrid.dnp3.mock.CountingPublisher
@RunWith(classOf[JUnitRunner])
@@ -16,10 +16,10 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.totalgrid.reef.protocol.dnp3.mock
+package org.totalgrid.dnp3.mock
-import org.totalgrid.reef.protocol.dnp3.{ CommandResponse, IResponseAcceptor }
import net.agileautomata.commons.testing.SynchronizedList
+import org.totalgrid.dnp3.{CommandResponse, IResponseAcceptor}
class CachingResponseAcceptor extends IResponseAcceptor {
@@ -16,12 +16,12 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.totalgrid.reef.protocol.dnp3.mock
+package org.totalgrid.dnp3.mock
import scala.collection.mutable
import scala.annotation.tailrec
import com.weiglewilczek.slf4s.Logging
-import org.totalgrid.reef.protocol.dnp3._
+import org.totalgrid.dnp3._
class CountingPublisher {
@@ -16,9 +16,9 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.totalgrid.reef.protocol.dnp3.mock
+package org.totalgrid.dnp3.mock
-import org.totalgrid.reef.protocol.dnp3._
+import org.totalgrid.dnp3._
class InstantCommandResponder(status: CommandStatus) extends ICommandAcceptor {
@@ -16,9 +16,9 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.totalgrid.reef.protocol.dnp3.mock
+package org.totalgrid.dnp3.mock
-import org.totalgrid.reef.protocol.dnp3._
+import org.totalgrid.dnp3._
import scala.collection.mutable
class MockCommandAcceptor extends ICommandAcceptor {
@@ -16,10 +16,10 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.totalgrid.reef.protocol.dnp3.mock
+package org.totalgrid.dnp3.mock
import scala.collection.mutable
-import org.totalgrid.reef.protocol.dnp3._
+import org.totalgrid.dnp3._
class MockDataObserver extends IDataObserver {
View
@@ -625,7 +625,7 @@ demo_slave_cpp_SOURCES = \
JAVA_DIR=$(builddir)/java
if WANT_JAVA
-JAVA_PACKAGE_DIR=org/totalgrid/reef/protocol/dnp3
+JAVA_PACKAGE_DIR=org/totalgrid/dnp3
JAVA_SOURCE_DIR=$(JAVA_DIR)/src
JAVA_CLASS_DIR=$(JAVA_DIR)/bin
@@ -634,7 +634,7 @@ JAVA_SRC_FILES = $(JAVA_SOURCE_DIR)/$(JAVA_PACKAGE_DIR)/*.java
swig/.java-built: swig/swigDNP3.i
-@mkdir -p $(JAVA_SOURCE_DIR)/$(JAVA_PACKAGE_DIR)
swig -c++ -java \
- -package org.totalgrid.reef.protocol.dnp3 \
+ -package org.totalgrid.dnp3 \
-I$(top_srcdir)/src \
-outdir $(JAVA_SOURCE_DIR)/$(JAVA_PACKAGE_DIR) \
-o swig/JavaDNP3.cpp $^
View
@@ -12,7 +12,7 @@ using namespace apl::dnp;
%pragma(java) jniclasscode=%{
static {
- if(System.getProperty("org.totalgrid.reef.protocol.dnp3.nostaticload") == null) System.loadLibrary("opendnp3-java");
+ if(System.getProperty("org.totalgrid.dnp3.nostaticload") == null) System.loadLibrary("opendnp3-java");
}
%}

0 comments on commit 4c94000

Please sign in to comment.