tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lrese...@apache.org
Subject svn commit: r718858 [9/9] - in /tuscany/java/sca/modules: ./ assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ assembly-xml/src/main/resources/ assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ assembly-xml/src/test/resource...
Date Wed, 19 Nov 2008 05:28:12 GMT
Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Authentication.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Callback.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
  * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ComponentName.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
  * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Confidentiality.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Constructor.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
  * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Context.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
  * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationAttributes.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/ConversationID.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
  * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Conversational.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Destroy.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
  * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/EagerInit.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/EndsConversation.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Init.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
  * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Integrity.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Intent.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/OneWay.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
  * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/PolicySets.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Property.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
  * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Qualifier.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Reference.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
  * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Remotable.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
  * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Requires.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
+ * 
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Scope.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
  * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Modified: tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java (original)
+++ tuscany/java/sca/modules/sca-api/src/main/java/org/osoa/sca/annotations/Service.java Tue Nov 18 21:27:58 2008
@@ -1,20 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * (c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA Technologies,
+ * Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens AG., Software AG., Sybase
+ * Inc., TIBCO Software Inc., 2005, 2007. All rights reserved.
  * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * see http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications
  */
 package org.osoa.sca.annotations;
 

Propchange: tuscany/java/sca/modules/tracing-aspectj/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Nov 18 21:27:58 2008
@@ -1,11 +1,19 @@
 target
+work
+dojo
 *.iws
 *.ipr
 *.iml
-*.log*
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
 .project
 .classpath
-junit*.properties
 .settings
 .deployables
 .wtpmodules

Propchange: tuscany/java/sca/modules/tracing-aspectj/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 18 21:27:58 2008
@@ -1 +1,2 @@
-/tuscany/java/sca/modules/tracing-aspectj:694837-694843,694855
+/tuscany/branches/sca-java-1.x/modules/tracing-aspectj:713805-714043
+/tuscany/java/sca/modules/tracing-aspectj:694816-713804

Modified: tuscany/java/sca/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java (original)
+++ tuscany/java/sca/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/LoggingAspect.java Tue Nov 18 21:27:58 2008
@@ -32,6 +32,8 @@
 import org.aspectj.lang.annotation.Pointcut;
 
 /**
+ * LoggingAspect performs standard logging of method signatures, arguments, and
+ * return values. All Tuscany methods, constructors, and statics are logged.
  * @version $Rev$ $Date$
  */
 @Aspect
@@ -50,44 +52,54 @@
     
     @Pointcut("cflow(anyMethodExecution()) && anyLogCall()")
     public void anyLog() {
-        
     }
-    
-    // @Around("anyMethodCall() || anyLog()")
-    @Around("anyLog()")
-    public Object around(ProceedingJoinPoint jp) throws Throwable {
-        System.out.println("Around: " + jp);
-        long start = System.currentTimeMillis();
-        try {
-            return jp.proceed();
-        } finally {
-            long end = System.currentTimeMillis();
-            System.out.println("Roundtrip is " + (end - start) + "ms for " + jp.getSignature());
-        }
 
+    @Pointcut("call(org.apache.tuscany.sca..*.new(..))")
+    public void anyConstructor() {
     }
 
-    @Before("anyMethodCall()")
-    public void before(JoinPoint jp) {
-        System.out.println("Before: " + jp);
-        System.out.println("Location: " + jp.getSourceLocation());
-        System.out.println("This: " + jp.getThis());
-        System.out.println("Target: " + jp.getTarget());
-        System.out.println("Input: " + Arrays.asList(jp.getArgs()));
+    // e.g. org.apache.tuscany.sca.implementation.java.introspect.impl.JavaIntrospectionHelper
+    @Pointcut("staticinitialization(org.apache.tuscany.sca.implementation..*)")
+    public void anyStatic() {
     }
 
-    @After("anyMethodCall()")
-    public void after(JoinPoint jp) {
-        System.out.println("After: " + jp);
+    @Before("anyMethodCall()")
+    public void before(JoinPoint jp) {
+        // System.out.println("Logging anyMethodCall before jp=" + jp);
+        // System.out.println("Logging anyMethodCall before jp.getSourceLocation=" + jp.getSourceLocation());
+        // System.out.println("Logging anyMethodCall before jp.getThis=" + jp.getThis());
+        // System.out.println("Logging anyMethodCall before jp.getTarget=" + jp.getTarget());
+        System.out.println("Logging Before anyMethodCall jp.getSignature=" + jp.getSignature());
+        java.lang.Object[] args = jp.getArgs();
+        if (( args != null ) && ( args.length > 0 )) {
+           System.out.println("Logging Before anyMethodCall jp.getArgs=" + Arrays.asList(args));
+        }
     }
 
     @AfterReturning(pointcut = "anyMethodCall()", returning = "result")
     public void afterReturning(JoinPoint jp, Object result) {
-        System.out.println("After returning: " + jp + " " + result);
+        // Note that result is null for methods with void return.
+        System.out.println("Logging AfterReturning anyMethodCall jp=" + jp + ", result=" + result);
+    }
+
+    @AfterThrowing(pointcut = "anyMethodCall()", throwing = "t")
+    public void afterThrowing(JoinPoint jp, Throwable t) {
+        System.out.println("Logging AfterThrowing anyMethodCall jp=" + jp + ", t=" + t);
+    }
+
+    @Before("anyConstructor()")
+    public void beforeConstructor(JoinPoint jp) {
+        System.out.println("Logging Before anyConstructor jp.getSignature=" + jp.getSignature());
+        java.lang.Object[] args = jp.getArgs();
+        if (( args != null ) && ( args.length > 0 )) {
+           System.out.println("Logging Before anyConstructor jp.getArgs=" + Arrays.asList(args));
+        }
     }
 
-    @AfterThrowing(pointcut = "anyMethodCall()", throwing = "e")
-    public void afterThrowing(Exception e) {
+    @Before("anyStatic()")
+    public void beforeStatic(JoinPoint jp) {
+        System.out.println("Logging Before anyStatic before jp=" + jp);
+        System.out.println("Logging anyMethodCall before jp.getSourceLocation=" + jp.getSourceLocation());
     }
 
 }

Modified: tuscany/java/sca/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java (original)
+++ tuscany/java/sca/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java Tue Nov 18 21:27:58 2008
@@ -26,57 +26,62 @@
 import org.aspectj.lang.annotation.Pointcut;
 
 /**
+ * SimpleTraceAspect performs tracing of method signatures, arguments, and
+ * return values. All Tuscany methods, constructors, and statics are traced.
+ * 
  * @version $Rev$ $Date$
  */
 @Aspect
 public class SimpleTracingAspect extends TracingAspect {
 
-    public SimpleTracingAspect() {
-        super();
-    }
-
-    @Override
-    protected void completeLog() {
-        System.out.println("completeLog()");
-    }
-
-    @Pointcut("execution(public * org.apache.tuscany.sca..*.*(..)) &&!within(java..*)")
+    @Pointcut("execution(public * org.apache.tuscany.sca..*.*(..))")
+    // @Pointcut("call(* org.apache.tuscany.sca..*(..))")
     protected void entry() {
     }
 
-    @Pointcut("within(org.apache.tuscany.sca..*) && !within(org.apache.tuscany.sca.aspectj.*Aspect)")
+    @Pointcut("within(org.apache.tuscany.sca..*) && !within(org.apache.tuscany.sca.aspectj..*Aspect)")
     protected void withinScope() {
     }
 
     @Override
-    protected void logEnter(JoinPoint jp) {
-        System.out.println("> " + jp.getSignature());
-        if (jp.getArgs().length != 0) {
-            System.out.println("Input: " + Arrays.asList(jp.getArgs()));
-        }
+    protected void startLog() {
+        System.out.println(">>> ----------------------------------------------------");
     }
 
     @Override
-    protected void logExit(JoinPoint jp) {
-        // System.out.println("> " + jp.getSignature());
+    protected void completeLog() {
+        System.out.println("<<< ----------------------------------------------------");
     }
 
     @Override
-    protected void logException(JoinPoint jp, Throwable throwable) {
-        System.out.println("! " + jp.getSignature() + " " + throwable.getMessage());
+    protected void logEnter(JoinPoint jp) {
+        System.out.println("> logEnter jp.getSignature=" + jp.getSignature());
+        java.lang.Object[] args = jp.getArgs();
+        if (( args != null ) && ( args.length > 0 )) {
+       	// See http://www.eclipse.org/aspectj/doc/released/progguide/pitfalls-infiniteLoops.html
+           // System.out.println("Logging anyMethodCall before jp.getArgs=" + Arrays.asList(args));
+           System.out.print("  logEnter jp.getArgs(" + args.length + ")=[" );
+           for ( int i = 0; i < args.length; i++ ){
+        	  if ( i > 0 ) System.out.print( ",");
+        	  System.out.print( args[ i ]);
+           }
+           System.out.println("]" );
+        }
     }
 
     @Override
     protected void logExit(JoinPoint jp, Object result) {
-        System.out.println("< " + jp.getSignature());
-        if (!jp.getSignature().toString().startsWith("void ")) {
-            System.out.println("Output: " + result);
-        }
+        // Note that result is null for methods with void return.
+        System.out.println("< logExit jp.getSignature=" + jp.getSignature() +", result=" + result );        
     }
 
     @Override
-    protected void startLog() {
-        System.out.println("startLog()");
+    protected void logThrowable(JoinPoint jp, Throwable throwable) {
+    	while ( throwable.getCause() != null )
+    		throwable = throwable.getCause();
+        System.out.println("! logThrowable jp.getSignature=" + jp.getSignature() + ", throwable=" + throwable);
+        // System.out.println("! logThowable stackTrace=" ); 
+        // throwable.printStackTrace( System.out );
     }
 
 }

Modified: tuscany/java/sca/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java (original)
+++ tuscany/java/sca/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/TracingAspect.java Tue Nov 18 21:27:58 2008
@@ -37,19 +37,20 @@
     @Pointcut("")
     protected abstract void entry();
 
-    /** ignore join points outside this scope - use within(..) */
     @Pointcut("")
     protected abstract void withinScope();
 
-    @Pointcut("withinScope() && call(* java..*.*(..))")
+    @Pointcut("call(* java..*.*(..))")
     protected void exit() {
     }
 
-    @Pointcut("withinScope() && entry() && !cflowbelow(entry())")
+    @Pointcut("entry() && !cflowbelow(entry())")
     void start() {
     }
 
-    @Pointcut("withinScope() && cflow(entry()) && !cflowbelow(exit()) && !within(org.apache.tuscany.sca.aspectj.*Aspect)")
+    // @Pointcut("withinScope() && cflow(entry()) && !cflow(exit()) && !within(org.apache.tuscany.sca.aspectj.*Aspect) && !within(*.toString)")
+    @Pointcut("withinScope() && entry()")
+    // @Pointcut("withinScope() && entry()&& !cflow(execution(String toString())")
     void trace() {
     }
 
@@ -66,12 +67,7 @@
     public void beforeTrace(JoinPoint jp) {
         logEnter(jp);
     }
-
-    @After("trace() && supportsAfterAdvice()")
-    public void afterTrace(JoinPoint jp) {
-        logExit(jp);
-    }
-    
+   
     @AfterReturning(pointcut = "trace() && supportsAfterAdvice()", returning = "result")
     public void afterReturning(JoinPoint jp, Object result) {
         logExit(jp, result);
@@ -79,7 +75,7 @@
 
     @AfterThrowing(pointcut = "trace() && supportsAfterAdvice()", throwing = "e")
     public void afterThrowing(JoinPoint jp, Throwable e) {
-        logException(jp, e);
+        logThrowable(jp, e);
     }
 
     @After("start()")
@@ -88,13 +84,9 @@
     }
 
     protected abstract void logEnter(JoinPoint jp);
-
-    protected abstract void logExit(JoinPoint jp);
     protected abstract void logExit(JoinPoint jp, Object result);
-    protected abstract void logException(JoinPoint jp, Throwable throwable);
+    protected abstract void logThrowable(JoinPoint jp, Throwable throwable);
 
     protected abstract void startLog();
-
     protected abstract void completeLog();
-
 }

Modified: tuscany/java/sca/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml (original)
+++ tuscany/java/sca/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml Tue Nov 18 21:27:58 2008
@@ -1,16 +1,24 @@
 <aspectj>
 
     <aspects>
-        <!-- declare two existing aspects to the weaver -->
-        <aspect name="org.apache.tuscany.sca.aspectj.SimpleTracingAspect" />
-        <!-- 
-        <aspect name="org.apache.tuscany.sca.aspectj.LoggingAspect" />
-         -->
-
+        <!-- Uncomment either of these two aspects to perform standard logging -->
+        <!-- or standard tracing on the Tuscany runtime.                       -->
+        <!-- <aspect name="org.apache.tuscany.sca.aspectj.SimpleTracingAspect" /> -->   
+        <!-- <aspect name="org.apache.tuscany.sca.aspectj.LoggingAspect" /> --> 
+        
+        <!-- Following is a concrete-aspect that defines the point cut for   -->
+        <!-- the TimingAspect. Which ever calls you define in this pointcut  -->
+        <!-- will be timed and displayed in the logs.                        -->
+        <concrete-aspect name="org.apache.tuscany.sca.aspectj.UserTimingAspect"
+           extends="org.apache.tuscany.sca.aspectj.TimingAspect"
+           precedence="org.apache.tuscany.sca.aspectj.UserTimingAspect, *">
+           <pointcut name="timedCall" 
+              expression="call(* java.util.logging.Logger.info(..))"/>
+        </concrete-aspect>
     </aspects>
-
+  
     <!--weaver options="-verbose -debug -showWeaveInfo"-->
-    <weaver options="">
+    <weaver options="-verbose">
         <include within="org.apache.tuscany.sca..*" />
     </weaver>
 

Modified: tuscany/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java (original)
+++ tuscany/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelper.java Tue Nov 18 21:27:58 2008
@@ -150,9 +150,7 @@
         return inputSource;
     }
 
-    private final static XMLInputFactory inputFactory = XMLInputFactory.newInstance();
-
-    public static String readTargetNamespace(URL doc, QName element, boolean rootOnly, String attribute)
+    public static String readTargetNamespace(URL doc, QName element, boolean rootOnly, String attribute, XMLInputFactory inputFactory)
         throws IOException, XMLStreamException {
         if (attribute == null) {
             attribute = "targetNamespace";

Modified: tuscany/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java (original)
+++ tuscany/java/sca/modules/xsd-xml/src/main/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessor.java Tue Nov 18 21:27:58 2008
@@ -23,6 +23,7 @@
 import java.net.URL;
 
 import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
 
 import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
 import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
@@ -43,10 +44,12 @@
 public class XSDDocumentProcessor implements URLArtifactProcessor<XSDefinition> {
 
     private XSDFactory factory;
+    private XMLInputFactory inputFactory;
     private Monitor monitor;
 
     public XSDDocumentProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
         this.factory = modelFactories.getFactory(XSDFactory.class);
+        this.inputFactory = modelFactories.getFactory(XMLInputFactory.class);
         this.monitor = monitor;
     }
     
@@ -90,7 +93,7 @@
     protected XSDefinition indexRead(URL doc) throws Exception {
         XSDefinition xsd = factory.createXSDefinition();
         xsd.setUnresolved(true);
-        xsd.setNamespace(XMLDocumentHelper.readTargetNamespace(doc, XSD, true, "targetNamespace"));
+        xsd.setNamespace(XMLDocumentHelper.readTargetNamespace(doc, XSD, true, "targetNamespace", inputFactory));
         xsd.setLocation(doc.toURI());
         xsd.setUnresolved(false);
         return xsd;

Modified: tuscany/java/sca/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java?rev=718858&r1=718857&r2=718858&view=diff
==============================================================================
--- tuscany/java/sca/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java (original)
+++ tuscany/java/sca/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XMLDocumentHelperTestCase.java Tue Nov 18 21:27:58 2008
@@ -21,6 +21,8 @@
 
 import java.net.URL;
 
+import javax.xml.stream.XMLInputFactory;
+
 import junit.framework.Assert;
 
 import org.junit.Before;
@@ -42,7 +44,7 @@
 
     @Test
     public void testReadTNS() throws Exception {
-        String tns = XMLDocumentHelper.readTargetNamespace(xsd, XMLDocumentHelper.XSD, true, null);
+        String tns = XMLDocumentHelper.readTargetNamespace(xsd, XMLDocumentHelper.XSD, true, null, XMLInputFactory.newInstance());
         Assert.assertEquals("http://greeting", tns);
     }
 



Mime
View raw message