tct3_javasrc.patch 8.95 KB
Newer Older
1
2
Index: adapter/org/etsi/its/adapter/TestAdapter.java
===================================================================
garciay's avatar
garciay committed
3
--- adapter/org/etsi/its/adapter/TestAdapter.java	(revision 2612)
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
+++ adapter/org/etsi/its/adapter/TestAdapter.java	(working copy)
@@ -20,7 +20,6 @@
 import org.etsi.its.adapter.ports.ProtocolPortFactory;
 import org.etsi.its.adapter.ports.UpperTesterPort;
 import org.etsi.ttcn.tci.CharstringValue;
-import org.etsi.ttcn.tri.TriActionTemplate;
 import org.etsi.ttcn.tri.TriAddress;
 import org.etsi.ttcn.tri.TriAddressList;
 import org.etsi.ttcn.tri.TriCommunicationSA;
@@ -74,7 +73,6 @@
     /* (non-Javadoc)
      * @see org.etsi.ttcn.tri.TriCommunicationSA#triExecuteTestcase(org.etsi.ttcn.tri.TriTestCaseId, org.etsi.ttcn.tri.TriPortIdList)
      */
-    @Override
     public TriStatus triExecuteTestcase(final TriTestCaseId tcId, final TriPortIdList portList) {
         return required.getTriStatus(TriStatus.TRI_OK);
     } 
@@ -303,15 +301,6 @@
     }
 
     /**
-     * triSutActionTemplate not implemented
-     * @see org.etsi.ttcn.tri.TriCommunicationSA#triSutActionTemplate(org.etsi.ttcn.tri.TriActionTemplate)
-     */
-    @Override
-    public TriStatus triSutActionTemplate(TriActionTemplate templateValue) {
-        return required.getTriStatus(TriStatus.TRI_ERROR, "triSutActionTemplate not implemented");
-    }
-
-    /**
      * triMapParam not implemented
      * @see org.etsi.ttcn.tri.TriCommunicationSA#triMapParam(org.etsi.ttcn.tri.TriPortId, org.etsi.ttcn.tri.TriPortId, org.etsi.ttcn.tri.TriParameterList)
      */
@@ -328,4 +317,28 @@
     public TriStatus triUnmapParam(TriPortId compPortId, TriPortId tsiPortId, TriParameterList paramList) {
         return required.getTriStatus(TriStatus.TRI_ERROR, "triUnmapParam not implemented");
     }
+
+    @Override
+    public TriStatus triExecuteTestCase(TriTestCaseId arg0, TriPortIdList arg1) {
+        // TODO Auto-generated method stub
+        return triExecuteTestcase(arg0, arg1);
+    }
+
+    @Override
+    public TriStatus triGetStreamValue(TriComponentId arg0, TriPortId arg1, TriAddress arg2, TriMessage arg3) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public TriStatus triSetStreamValue(TriComponentId arg0, TriPortId arg1, TriAddress arg2, TriMessage arg3) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public TriStatus triStaticMap(TriPortId arg0, TriPortId arg1) {
+        // TODO Auto-generated method stub
+        return null;
+    }
 } 
garciay's avatar
garciay committed
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
Index: certificatesio/org/etsi/certificates/io/CertificatesIO.java
===================================================================
--- certificatesio/org/etsi/certificates/io/CertificatesIO.java	(revision 2612)
+++ certificatesio/org/etsi/certificates/io/CertificatesIO.java	(working copy)
@@ -149,7 +149,7 @@
      */
     @Override
     public boolean readCertificate(final String key, final ByteArrayOutputStream certificate) {
-//        TERFactory.getInstance().logDebug(">>> CertificatesIO.readCertificate: " + key);
+        TERFactory.getInstance().logDebug(">>> CertificatesIO.readCertificate: " + key);
         
         String certKey;
         if (_cachedReverseCertificatesDigest.containsKey(key)) {
@@ -173,7 +173,7 @@
     
     @Override
     public boolean readCertificateDigest(final String certificateId, final ByteArrayOutputStream digest) {
-//        TERFactory.getInstance().logDebug(">>> CertificatesIO.readCertificateDigest: " + certificateId);
+        TERFactory.getInstance().logDebug(">>> CertificatesIO.readCertificateDigest: " + certificateId);
         
         // Sanity check
         if (!_cachedCertificatesDigest.containsKey(certificateId)) {
@@ -199,7 +199,7 @@
      */
     @Override
     public boolean readSigningKey(final String keyName, final ByteArrayOutputStream key) { 
-//        TERFactory.getInstance().logDebug(">>> CertificatesIO.readSigningKey: " + keyName);
+        TERFactory.getInstance().logDebug(">>> CertificatesIO.readSigningKey: " + keyName);
         
         try {
             String certKey;
@@ -305,11 +305,11 @@
             return;
         }
         _cachedCertificatesDigest.put(certName, bytes);
-//        TERFactory.getInstance().logDebug("CertificatesIO.addDigestItem: Store digest: " + ByteHelper.byteArrayToString(bytes) + " - " + certName);
+        TERFactory.getInstance().logDebug("CertificatesIO.addDigestItem: Store digest: " + ByteHelper.byteArrayToString(bytes) + " - " + certName);
     }
     
     private void addCertItem(final File p_certFile)  throws FileNotFoundException, IOException {
-//        TERFactory.getInstance().logDebug(">>> CertificatesIO.addItem: " + p_certFile);
+        TERFactory.getInstance().logDebug(">>> CertificatesIO.addCertItem: " + p_certFile);
         
         // Load the keys file name
         String filename = p_certFile.getName();
@@ -322,14 +322,14 @@
         fsKeys.close();
         bytes = ByteHelper.hexStringToByteArray(new String(bytes));
         _cachedCertificates.put(certName, bytes);
-//        TERFactory.getInstance().logDebug("CertificatesIO.addItem: Store cert " + certName + " - " + ByteHelper.byteArrayToString(bytes));
+        TERFactory.getInstance().logDebug("CertificatesIO.addCertItem: Store cert " + certName + " - " + ByteHelper.byteArrayToString(bytes));
         
         // calculate digest
         bytes = calculateDigestFromCertificate(bytes);
         _cachedCertificatesDigest.put(certName, bytes);
-//        TERFactory.getInstance().logDebug("CertificatesIO.addItem: Store digest: " + ByteHelper.byteArrayToString(bytes) + " - " + certName);
+        TERFactory.getInstance().logDebug("CertificatesIO.addCertItem: Store digest: " + ByteHelper.byteArrayToString(bytes) + " - " + certName);
         _cachedReverseCertificatesDigest.put(ByteHelper.byteArrayToString(bytes), certName);
-//        TERFactory.getInstance().logDebug("CertificatesIO.addItem: Store reverse digest " + ByteHelper.byteArrayToString(bytes) + " - " + certName);
+        TERFactory.getInstance().logDebug("CertificatesIO.addCertItem: Store reverse digest " + ByteHelper.byteArrayToString(bytes) + " - " + certName);
         
         // Load Private Keys
         filename = p_certFile.getPath();
129
130
Index: codec/org/etsi/ttcn/codec/CodecFactory.java
===================================================================
garciay's avatar
garciay committed
131
--- codec/org/etsi/ttcn/codec/CodecFactory.java	(revision 2612)
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
+++ codec/org/etsi/ttcn/codec/CodecFactory.java	(working copy)
@@ -83,7 +83,7 @@
         if(codec != null) {
             //TERFactory.getInstance().logDebug(String.format("%50s", encoding));
             //TERFactory.getInstance().logDebug(" ==> " + codec.getClass().getName());
-            System.out.println(String.format("%50s", encoding) + " ==> " + codec.getClass().getName());
+            //System.out.println(String.format("%50s", encoding) + " ==> " + codec.getClass().getName());
             return codec;
         }
         return null;
@@ -92,12 +92,12 @@
     public ICodec getCodec(MainCodec mainCodec, int classType, String encoding, String typeName) {
 
         //TERFactory.getInstance().logDebug(String.format("%50s", typeName + "(" + encoding + ")"));
-        System.out.println(String.format("%50s", typeName + "(" + encoding + ")"));
+//        System.out.println(String.format("%50s", typeName + "(" + encoding + ")"));
         Class<? extends ICodec> cls = null;
         Class<?>[] ctorParams = {MainCodec.class};
 
         //TERFactory.getInstance().logDebug("getCodec: Search internal codec for " + classType + '/' + encoding + '/' + typeName);
-        System.out.println("getCodec: Search internal codec for " + classType + '/' + encoding + '/' + typeName);
+//        System.out.println("getCodec: Search internal codec for " + classType + '/' + encoding + '/' + typeName);
         cls = codecs.get(classType + '/' + encoding + '/' + typeName);
         if(cls == null) {
             cls = codecs.get(classType + '/' + encoding + '/');
@@ -108,7 +108,7 @@
 
         if(cls != null) {
             //TERFactory.getInstance().logDebug(" ==> " + cls.getName());
-            System.out.println(" ==> " + cls.getName());
+            //System.out.println(" ==> " + cls.getName());
             try {
                 Constructor<? extends ICodec> ctor = cls.getConstructor(ctorParams);
                 return ctor.newInstance(mainCodec);
Index: codec/org/etsi/ttcn/codec/MainCodec.java
===================================================================
garciay's avatar
garciay committed
168
--- codec/org/etsi/ttcn/codec/MainCodec.java	(revision 2612)
169
170
171
172
173
174
175
176
177
178
+++ codec/org/etsi/ttcn/codec/MainCodec.java	(working copy)
@@ -67,6 +67,8 @@
 
     @Override
     public CodecBuffer encode(Value value) {
+        //TERFactory.getInstance().logDebug(">>> MainCodec.encode: " + value);
+        //System.out.println(">>> MainCodec.encode: " + value);
         
         CodecFactory cf = CodecFactory.getInstance();
         TciCDProvided extCodec = cf.getExternalCodec(value.getValueEncoding());