-
Notifications
You must be signed in to change notification settings - Fork 294
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #655 from SCADA-LTS/develop
v0.0.9.5
- Loading branch information
Showing
5,343 changed files
with
704,674 additions
and
6 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <classpath> | ||
| <classpathentry kind="src" path="src"/> | ||
| <classpathentry kind="src" path="test"/> | ||
| <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> | ||
| <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> | ||
| <classpathentry exported="true" kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0"> | ||
| <attributes> | ||
| <attribute name="owner.project.facets" value="#system#;jst.web"/> | ||
| </attributes> | ||
| </classpathentry> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/activation.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/alpha24j.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/axis.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/bacnet4J.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/catalina-ant-6.0.29.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/commons-beanutils-1.8.3.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/commons-codec-1.3.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/commons-collections-3.2.2.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/commons-dbcp-jdbc4.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/commons-discovery-0.2.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/commons-httpclient-3.0.1.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/commons-io.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/commons-lang3-3.0.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/commons-logging.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/commons-pool.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/crowd-integration-client-2.1.1.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/derby.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/derbytools.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/dnp3.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/dnp34j.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/dwr.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/ezmorph-1.0.6.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/fhz4j-core-0.1.4-SNAPSHOT.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/freemarker.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/iec101.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/j-interop-2.06.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/j-interopdeps-1.4.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/jackson-annotations-2.7.4.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/jackson-core-2.7.4.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/jackson-databind-2.7.4.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/javamelody-1.59.0.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/jaxrpc.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/jboss-common-jdbc-wrapper-3.2.3.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/jcifs-1.2.19.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/jcommon-1.0.23.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/jdom-1.0.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/jfreechart-1.0.19.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/joda-time-2.3.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/jrobin-1.5.9.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/js.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/json-lib-2.3-jdk15.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/jstl-api-1.2.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/jstl-impl-1.2.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/jstl.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/log4j-1.2.17.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/mail.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/mbus4j-core-0.1.4-SNAPSHOT.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/mbus4j-master-0.1.4-SNAPSHOT.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/mockito-all-1.9.5.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/mysql-connector-java-3.1.8-bin.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/mysql-connector-java-5.1.38-bin.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/mysql-connector-java-5.1.7-bin.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/ojdbc6.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/OneWireAPI.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/opc-driver.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/openscada-utils.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/openv4j-core-0.1.4-SNAPSHOT.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/org.openscada.opc.dcom-0.5.0.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/org.openscada.opc.lib-0.5.0.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/org.osgi.core-4.0.0.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/org.restlet-2.0.0.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/org.restlet.ext.json-2.0.0.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/org.restlet.ext.servlet-2.0.0.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/org.restlet.lib.org.json-2.0.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/postgresql-9.2-1000.jdbc4.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/quartz-1.6.3.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/rts.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/RXTXcomm.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/saaj.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/slf4j-api-1.5.11.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/slf4j-log4j12-1.5.11.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/SNMP4J.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spinwave.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-jdbc-3.2.17.RELEASE.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/sqljdbc4.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/standard.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/taglibs-log.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/viconics.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/wsdl4j-1.5.1.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/wsdl4j.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/wss4j-1.5.8.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/xfire-aegis-1.2.6.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/xfire-core-1.2.6.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/xmlsec-1.4.3.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/serotonin-timer.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/seroUtils.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-aop-4.3.2.RELEASE.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-beans-4.3.2.RELEASE.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-context-4.3.2.RELEASE.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-context-support-4.3.2.RELEASE.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-core-4.3.2.RELEASE.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-expression-4.3.2.RELEASE.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-jdbc-4.3.2.RELEASE.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-tx-4.3.2.RELEASE.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-web-4.3.2.RELEASE.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-webmvc-4.3.2.RELEASE.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/modbus4j-3.0.2-javadoc.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/modbus4j-3.0.2-sources.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/modbus4j-3.0.2.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/commons-fileupload-1.3.2.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-messaging-4.3.2.RELEASE.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-websocket-4.3.2.RELEASE.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-tx-3.2.17.RELEASE.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-security-acl-4.2.0.RELEASE.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-security-config-4.2.0.RELEASE.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-security-core-4.2.0.RELEASE.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-security-crypto-4.2.0.RELEASE.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-security-jwt-1.0.6.RELEASE.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-security-taglibs-4.2.0.RELEASE.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-security-web-4.2.0.RELEASE.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/flyway-core-4.0.3.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/flyway-core-4.0.3-sources.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/spring-test-4.3.2.RELEASE.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="WebContent/WEB-INF/lib/junit-4.8.2.jar"/> | ||
| <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk"> | ||
| <attributes> | ||
| <attribute name="owner.project.facets" value="java"/> | ||
| </attributes> | ||
| </classpathentry> | ||
| <classpathentry kind="output" path="build/classes"/> | ||
| </classpath> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,96 @@ | ||
| # Directories # | ||
| /build/ | ||
| /bin/ | ||
| target/ | ||
| /WebContent/assets/.sass-cache/ | ||
| /WebContent/images/oldicons | ||
| /WebContent/resources/app/bower_components/ | ||
| # OS Files # | ||
| .DS_Store | ||
| *.class | ||
|
|
||
| # Mobile Tools for Java (J2ME) | ||
| .mtj.tmp/ | ||
|
|
||
| # Package Files # | ||
| *.jar | ||
| *.war | ||
| *.ear | ||
|
|
||
| # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml | ||
| hs_err_pid* | ||
| ======= | ||
| *.db | ||
| *~ | ||
| ###################### | ||
| # Windows | ||
| ###################### | ||
| # Windows image file caches | ||
| Thumbs.db | ||
| # Folder config file | ||
| Desktop.ini | ||
| ###################### | ||
| # OSX | ||
| ###################### | ||
| .DS_Store | ||
| .svn | ||
| # Thumbnails | ||
| ._* | ||
| # Files that might appear on external disk | ||
| .Spotlight-V100 | ||
| .Trashes | ||
| ###################### | ||
| # Eclipse | ||
| ###################### | ||
| *.pydevproject | ||
| # .project | ||
| .metadata | ||
| bin/** | ||
| tmp/** | ||
| tmp/**/* | ||
| *.tmp | ||
| *.bak | ||
| *.swp | ||
| *~.nib | ||
| local.properties | ||
| # .classpath | ||
| # .settings/ | ||
| .loadpath | ||
| /src/main/resources/rebel.xml | ||
| # External tool builders | ||
| .externalToolBuilders/ | ||
| /WebContent/resources/app/bower_components | ||
| /WebContent/assets/logo.png | ||
| /WebContent/assets/evn.properties | ||
| /WebContent/assets/commons.css | ||
| # Locally stored "Eclipse launch configurations" | ||
| *.launch | ||
| # CDT-specific | ||
| .cproject | ||
| # PDT-specific | ||
| .buildpath | ||
| # seroUtils.jar | ||
| seroUtils.jar | ||
| *deploy_rsa | ||
| *deploy_rsa.pub | ||
| *.exe | ||
| *client*.png | ||
| *client*.css | ||
| *.vpp | ||
| ########################### | ||
| # ScadaLTS-UI | ||
| ########################### | ||
| /ScadaLTS-UI/node_modules/ | ||
| /ScadaLTS-UI/.editorconfig | ||
| /ScadaLTS-UI/dist | ||
| ########################### | ||
| # docker | ||
| ########################### | ||
| docker/app/** | ||
|
|
||
| ########################### | ||
| # intelij | ||
| ########################### | ||
| .idea | ||
| scadabr-1.1.0-RC.iml | ||
| scadabr-1.1.0-RC_.iml | ||
|
|
||
| ########################### | ||
| # jrebel | ||
| ########################### | ||
| catalina-jrebel.bat | ||
| scadabr-1.1.0-RC.iml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <name>scadabr-1.1.0-RC</name> | ||
| <comment></comment> | ||
| <projects> | ||
| </projects> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.eclipse.jdt.core.javabuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.eclipse.wst.common.project.facet.core.builder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.eclipse.wst.validation.validationbuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.springframework.ide.eclipse.core.springbuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>org.springframework.ide.eclipse.core.springnature</nature> | ||
| <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> | ||
| <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> | ||
| <nature>org.eclipse.wst.common.project.facet.core.nature</nature> | ||
| <nature>org.eclipse.jdt.core.javanature</nature> | ||
| <nature>org.eclipse.wst.jsdt.core.jsNature</nature> | ||
| </natures> | ||
| </projectDescription> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <classpath> | ||
| <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> | ||
| <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> | ||
| <attributes> | ||
| <attribute name="hide" value="true"/> | ||
| </attributes> | ||
| </classpathentry> | ||
| <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> | ||
| <classpathentry kind="output" path=""/> | ||
| </classpath> |
Oops, something went wrong.