Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
office-sensor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Reiner Jung
office-sensor
Commits
a11d9591
Commit
a11d9591
authored
8 years ago
by
Reiner Jung
Browse files
Options
Downloads
Patches
Plain Diff
minor changes for persistence
parent
25e7afec
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
temperature/WebContent/index.jsp
+1
-1
1 addition, 1 deletion
temperature/WebContent/index.jsp
temperature/pom.xml
+2
-2
2 additions, 2 deletions
temperature/pom.xml
temperature/src/main/resources/META-INF/persistence.xml
+3
-3
3 additions, 3 deletions
temperature/src/main/resources/META-INF/persistence.xml
with
6 additions
and
6 deletions
temperature/WebContent/index.jsp
+
1
−
1
View file @
a11d9591
...
...
@@ -83,7 +83,7 @@ if (query.getResultList().size() > 0) {
function
drawSingleChart
(
graphLabel
,
divName
,
collectionName
,
windowSize
,
dateFormat
)
{
var
jsonData
=
$
.
ajax
({
url
:
"
http://192.168.
4
8.2
44
:8080/temperature/temperature?collection=
"
+
collectionName
,
url
:
"
http://192.168.
17
8.2
6
:8080/temperature/temperature?collection=
"
+
collectionName
,
dataType
:
"
json
"
,
async
:
false
}).
responseText
;
...
...
This diff is collapsed.
Click to expand it.
temperature/pom.xml
+
2
−
2
View file @
a11d9591
...
...
@@ -125,8 +125,8 @@
<artifactId>
tomcat7-maven-plugin
</artifactId>
<version>
2.2
</version>
<configuration>
<url>
http://192.168.
4
8.2
44
:8080/manager/text
</url>
<server>
stockholm
</server>
<url>
http://192.168.
17
8.2
6
:8080/manager/text
</url>
<server>
192.168.178.26
</server>
<path>
/temperature
</path>
<username>
tomcat
</username>
<password>
tomcat
</password>
...
...
This diff is collapsed.
Click to expand it.
temperature/src/main/resources/META-INF/persistence.xml
+
3
−
3
View file @
a11d9591
...
...
@@ -8,9 +8,9 @@
<properties>
<property
name=
"javax.persistence.jdbc.driver"
value=
"org.postgresql.Driver"
/>
<property
name=
"javax.persistence.jdbc.url"
value=
"jdbc:postgresql://localhost:5432/
temperature
s"
/>
value=
"jdbc:postgresql://localhost:5432/
measurement
s"
/>
<property
name=
"javax.persistence.jdbc.user"
value=
"office"
/>
<property
name=
"javax.persistence.jdbc.password"
value=
"
office
"
/>
<property
name=
"javax.persistence.jdbc.password"
value=
"
piz#404?
"
/>
<!-- EclipseLink should create the database schema automatically -->
<property
name=
"eclipselink.ddl-generation"
value=
"create-tables"
/>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment