Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Haug2015-06-25 16:24:59 -0400
committerJuergen Haug2015-06-25 16:24:59 -0400
commit7df50b1259ff7c0c68c369324fb1fa36d439806e (patch)
tree1c48347a16d94f06320ce77d0dd1cdb81ae4af3a
parent50a26df67341dce73449694f00e41e06c9b2eaf2 (diff)
downloadorg.eclipse.etrice-7df50b1259ff7c0c68c369324fb1fa36d439806e.tar.gz
org.eclipse.etrice-7df50b1259ff7c0c68c369324fb1fa36d439806e.tar.xz
org.eclipse.etrice-7df50b1259ff7c0c68c369324fb1fa36d439806e.zip
Bug 468791 runtime java logging folder is 'log'
-rw-r--r--examples/org.eclipse.etrice.examples.dynamicactors/.gitignore10
-rw-r--r--examples/org.eclipse.etrice.examples.dynamicactors/doc-gen/.gitignore3
-rw-r--r--examples/org.eclipse.etrice.examples.dynamicactors/log/readme.txt (renamed from examples/org.eclipse.etrice.examples.dynamicactors/tmp/log/readme.txt)0
-rw-r--r--examples/org.eclipse.etrice.examples.dynamicactors/src-gen/.gitignore3
-rw-r--r--examples/org.eclipse.etrice.examples.dynamicactors/tmp/log/.gitignore3
-rw-r--r--examples/org.eclipse.etrice.tutorials.java.aspecttrace/.gitignore2
-rw-r--r--examples/org.eclipse.etrice.tutorials.java.aspecttrace/log/readme.txt (renamed from examples/org.eclipse.etrice.tutorials.java/tmp/log/readme.txt)0
-rw-r--r--examples/org.eclipse.etrice.tutorials.java.aspecttrace/tmp/log/.gitignore2
-rw-r--r--examples/org.eclipse.etrice.tutorials.java/.gitignore2
-rw-r--r--examples/org.eclipse.etrice.tutorials.java/log/readme.txt1
-rw-r--r--examples/org.eclipse.etrice.tutorials.java/tmp/log/.gitignore3
-rw-r--r--plugins/org.eclipse.etrice.generator.ui/src/org/eclipse/etrice/generator/ui/wizard/EmptyProjectWizard.java2
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.c.zipbin81125 -> 108985 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.dynamicactors.zipbin210060 -> 210060 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zipbin2428823 -> 764958 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zipbin43470 -> 43408 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zipbin8343109 -> 180416 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zipbin69867 -> 69444 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.c.zipbin12580 -> 12577 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zipbin28030 -> 27989 bytes
-rw-r--r--plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zipbin47926 -> 47781 bytes
-rw-r--r--runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/debugging/MSCLogger.java2
22 files changed, 15 insertions, 18 deletions
diff --git a/examples/org.eclipse.etrice.examples.dynamicactors/.gitignore b/examples/org.eclipse.etrice.examples.dynamicactors/.gitignore
index ae5b114fe..834bbf187 100644
--- a/examples/org.eclipse.etrice.examples.dynamicactors/.gitignore
+++ b/examples/org.eclipse.etrice.examples.dynamicactors/.gitignore
@@ -1,3 +1,9 @@
bin
-src-gen-info
-
+src-gen/*
+!src-gen/readme.txt
+src-gen-info/*
+!src-gen-info/readme.txt
+doc-gen/*
+!doc-gen/readme.txt
+log/*
+!log/readme.txt \ No newline at end of file
diff --git a/examples/org.eclipse.etrice.examples.dynamicactors/doc-gen/.gitignore b/examples/org.eclipse.etrice.examples.dynamicactors/doc-gen/.gitignore
deleted file mode 100644
index ceabd5c9e..000000000
--- a/examples/org.eclipse.etrice.examples.dynamicactors/doc-gen/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!.gitignore
-!readme.txt \ No newline at end of file
diff --git a/examples/org.eclipse.etrice.examples.dynamicactors/tmp/log/readme.txt b/examples/org.eclipse.etrice.examples.dynamicactors/log/readme.txt
index dadbdcfe8..dadbdcfe8 100644
--- a/examples/org.eclipse.etrice.examples.dynamicactors/tmp/log/readme.txt
+++ b/examples/org.eclipse.etrice.examples.dynamicactors/log/readme.txt
diff --git a/examples/org.eclipse.etrice.examples.dynamicactors/src-gen/.gitignore b/examples/org.eclipse.etrice.examples.dynamicactors/src-gen/.gitignore
deleted file mode 100644
index ceabd5c9e..000000000
--- a/examples/org.eclipse.etrice.examples.dynamicactors/src-gen/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!.gitignore
-!readme.txt \ No newline at end of file
diff --git a/examples/org.eclipse.etrice.examples.dynamicactors/tmp/log/.gitignore b/examples/org.eclipse.etrice.examples.dynamicactors/tmp/log/.gitignore
deleted file mode 100644
index ceabd5c9e..000000000
--- a/examples/org.eclipse.etrice.examples.dynamicactors/tmp/log/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!.gitignore
-!readme.txt \ No newline at end of file
diff --git a/examples/org.eclipse.etrice.tutorials.java.aspecttrace/.gitignore b/examples/org.eclipse.etrice.tutorials.java.aspecttrace/.gitignore
index c5b2f5b90..373bcee02 100644
--- a/examples/org.eclipse.etrice.tutorials.java.aspecttrace/.gitignore
+++ b/examples/org.eclipse.etrice.tutorials.java.aspecttrace/.gitignore
@@ -3,3 +3,5 @@ src-gen/*
!src-gen/readme.txt
src-gen-info/*
!src-gen-info/readme.txt
+log/*
+!log/readme.txt \ No newline at end of file
diff --git a/examples/org.eclipse.etrice.tutorials.java/tmp/log/readme.txt b/examples/org.eclipse.etrice.tutorials.java.aspecttrace/log/readme.txt
index f16bd7412..f16bd7412 100644
--- a/examples/org.eclipse.etrice.tutorials.java/tmp/log/readme.txt
+++ b/examples/org.eclipse.etrice.tutorials.java.aspecttrace/log/readme.txt
diff --git a/examples/org.eclipse.etrice.tutorials.java.aspecttrace/tmp/log/.gitignore b/examples/org.eclipse.etrice.tutorials.java.aspecttrace/tmp/log/.gitignore
deleted file mode 100644
index d6b7ef32c..000000000
--- a/examples/org.eclipse.etrice.tutorials.java.aspecttrace/tmp/log/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/examples/org.eclipse.etrice.tutorials.java/.gitignore b/examples/org.eclipse.etrice.tutorials.java/.gitignore
index fcf3941ca..834bbf187 100644
--- a/examples/org.eclipse.etrice.tutorials.java/.gitignore
+++ b/examples/org.eclipse.etrice.tutorials.java/.gitignore
@@ -5,3 +5,5 @@ src-gen-info/*
!src-gen-info/readme.txt
doc-gen/*
!doc-gen/readme.txt
+log/*
+!log/readme.txt \ No newline at end of file
diff --git a/examples/org.eclipse.etrice.tutorials.java/log/readme.txt b/examples/org.eclipse.etrice.tutorials.java/log/readme.txt
new file mode 100644
index 000000000..f16bd7412
--- /dev/null
+++ b/examples/org.eclipse.etrice.tutorials.java/log/readme.txt
@@ -0,0 +1 @@
+this is the place where the logs (MSCs) of the running applications go \ No newline at end of file
diff --git a/examples/org.eclipse.etrice.tutorials.java/tmp/log/.gitignore b/examples/org.eclipse.etrice.tutorials.java/tmp/log/.gitignore
deleted file mode 100644
index ceabd5c9e..000000000
--- a/examples/org.eclipse.etrice.tutorials.java/tmp/log/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!.gitignore
-!readme.txt \ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.generator.ui/src/org/eclipse/etrice/generator/ui/wizard/EmptyProjectWizard.java b/plugins/org.eclipse.etrice.generator.ui/src/org/eclipse/etrice/generator/ui/wizard/EmptyProjectWizard.java
index a034d2a7a..a4e119f73 100644
--- a/plugins/org.eclipse.etrice.generator.ui/src/org/eclipse/etrice/generator/ui/wizard/EmptyProjectWizard.java
+++ b/plugins/org.eclipse.etrice.generator.ui/src/org/eclipse/etrice/generator/ui/wizard/EmptyProjectWizard.java
@@ -190,7 +190,7 @@ public class EmptyProjectWizard extends Wizard implements INewWizard {
"Node_nodeRef1_mainRunner");
ProjectCreator.findOrCreateContainer(new Path("/"
- + baseName + "/tmp/log"),
+ + baseName + "/log"),
true, projectLocation, progressMonitor);
if (config.useMVNBuild()) {
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.c.zip
index 745ad2799..c7aeaaf83 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.c.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.dynamicactors.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.dynamicactors.zip
index 0f4b8f288..01ec788f8 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.dynamicactors.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.examples.dynamicactors.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
index 59d297871..f1cb44718 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
index c0a33c866..633ff66cb 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
index 151728c41..744be5d53 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip
index 34668fd05..80df0e4ad 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.c.zip
index e48c3123a..4f3e0abe6 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.template.c.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip
index a96de18d2..83c5d8e14 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip
Binary files differ
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
index 831cf64de..48abad09a 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
Binary files differ
diff --git a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/debugging/MSCLogger.java b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/debugging/MSCLogger.java
index 09b72ab80..dc0e0d2be 100644
--- a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/debugging/MSCLogger.java
+++ b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/debugging/MSCLogger.java
@@ -93,7 +93,7 @@ public class MSCLogger {
if (is_open){
try{
// Create file
- FileWriter fstream = new FileWriter("tmp/log/"+path+msc_name+".seq");
+ FileWriter fstream = new FileWriter("log/"+path+msc_name+".seq");
BufferedWriter out = new BufferedWriter(fstream);
//saveMSC(out);
saveMSCforTrace2UML(out);

Back to the top