Simplified the automake build using configure options instead of environment variables and cleaned up some of the makefile.am files. Adjusted build instructions. Moved directories that don't yet build or work out of the main build dir and obsolete docs to a contrib dir.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@883254 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 0 insertions, 127 deletions

diff --git a/sca-cpp/trunk/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp b/sca-cpp/trunk/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp
deleted file mode 100644
index d3f06e1b12..0000000000
--- a/sca-cpp/trunk/runtime/extensions/cpp/src/osoa/sca/CompositeContext.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * 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.
- */
-
-/* $Rev$ $Date$ */
-
-#include "commonj/sdo/SDO.h"
-
-#include "osoa/sca/CompositeContext.h"
-#include "osoa/sca/ServiceRuntimeException.h"
-
-#include "tuscany/sca/util/Logging.h"
-#include "tuscany/sca/cpp/CompositeContextImpl.h"
-#include "tuscany/sca/core/SCARuntime.h"
-
-using namespace commonj::sdo;
-using namespace tuscany::sca;
-using namespace tuscany::sca::cpp;
-
-
-namespace osoa
-{
-    namespace sca
-    {
-        // ===========
-        // Constructor
-        // ===========    
-        CompositeContext::CompositeContext(CompositeContext* implementation)
-            : impl(implementation)
-        {
-            logentry();
-        }
-
-        // ===================================
-        // Copy constructor: create a new impl
-        // ===================================
-        CompositeContext::CompositeContext(const CompositeContext& ctx)
-        {
-            logentry();
-            impl = new CompositeContextImpl(
-                tuscany::sca::SCARuntime::getCurrentRuntime()->getDefaultComponent());
-        }
-        
-        // =============================
-        // operator= : create a new impl
-        // =============================
-        CompositeContext& CompositeContext::operator=(const CompositeContext& ctx)
-        {
-            logentry();
-            if (this != &ctx)
-            {
-                impl = new CompositeContextImpl(
-                    tuscany::sca::SCARuntime::getCurrentRuntime()->getDefaultComponent());
-            }
-            return *this;
-        }
-        
-        // ==========
-        // Destructor
-        // ==========
-        CompositeContext::~CompositeContext()
-        {
-            logentry();
-            delete impl;
-        }
-        
-        // ====================================================
-        // getCurrent: create a context from the current composite
-        // ====================================================
-        CompositeContext CompositeContext::getCurrent()
-        {
-            logentry();
-            try
-            {
-                CompositeContext* cci = new CompositeContextImpl(
-                    tuscany::sca::SCARuntime::getCurrentRuntime()->getDefaultComponent());
-                    
-                return CompositeContext(cci);
-            }
-            catch (ServiceRuntimeException&)
-            {
-                throw;
-            }
-            catch (TuscanyRuntimeException& e)
-            {
-                throwException(ServiceRuntimeException, e);
-            }
-        }
-
-        // =============
-        // locateService
-        // =============
-        void* CompositeContext::locateService(const std::string& serviceName)
-        {
-            logentry();
-            void* sp = impl->locateService(serviceName);
-            return sp;
-        }
-
-        // =============
-        // getDataFactory
-        // =============
-        DataFactoryPtr CompositeContext::getDataFactory()
-        {
-            logentry();
-            DataFactoryPtr df = impl->getDataFactory();
-            return df;
-        }
-
-        
-    } // End namespace sca
-} // End namespace osoa