Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*not part of the build*

Browse Source 
fix for 74676


git-svn-id: svn://10.0.0.236/trunk@91262 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
idk%eng.sun.com
2001-04-04 07:01:42 +00:00
parent 9c980e4543
commit 0af6d623df
23 changed files with 357 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
mozilla/java/xpcom/connect/xpcom/Makefile.in
View File

@@ -1,65 +1,66 @@
#!gmake
#
# The contents of this file are subject to the Netscape Public
# License Version 1.1 (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.mozilla.org/NPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s):
# Igor Kushnirskiy <idk@eng.sun.com>
#
DEPTH=../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
LIBRARY_NAME = bcorb
MODULE = bcorb
IS_COMPONENT = 1
CPPSRCS = \
bcORB.cpp \
../src/Allocator.cpp \
../src/Call.cpp \
../src/Marshaler.cpp \
../src/ORB.cpp \
../src/UnMarshaler.cpp \
../src/util.cpp \
$(NULL)
EXPORTS = \
bcORB.h \
../public/bcIORB.h \
../public/bcDefs.h \
../public/bcICall.h \
../public/bcIUnMarshaler.h \
../public/bcIAllocator.h \
../public/bcIMarshaler.h \
../public/bcIStub.h \
../public/bcIThread.h
CXXFLAGS += -I../public -I../src
include $(topsrcdir)/config/rules.mk
#!gmake
#
# The contents of this file are subject to the Netscape Public
# License Version 1.1 (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.mozilla.org/NPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s):
# Igor Kushnirskiy <idk@eng.sun.com>
#
DEPTH=../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/config.mk
LIBRARY_NAME = bcorb
MODULE = bcorb
IS_COMPONENT = 1
CPPSRCS = \
bcORBComponent.cpp \
../src/Allocator.cpp \
../src/Call.cpp \
../src/Marshaler.cpp \
../src/ORB.cpp \
../src/UnMarshaler.cpp \
../src/util.cpp \
$(NULL)
EXPORTS = \
bcIORBComponent.h \
bcORBComponentCID.h \
../public/bcIORB.h \
../public/bcDefs.h \
../public/bcICall.h \
../public/bcIUnMarshaler.h \
../public/bcIAllocator.h \
../public/bcIMarshaler.h \
../public/bcIStub.h \
../public/bcIThread.h
CXXFLAGS += -I../public -I../src
include $(topsrcdir)/config/rules.mk

32
mozilla/java/xpcom/connect/xpcom/bcORB.h → mozilla/java/xpcom/connect/xpcom/bcIORBComponent.h
View File

@@ -20,35 +20,19 @@
* Igor Kushnirskiy <idk@eng.sun.com>
*/
#ifndef _bcORB_h
#define _bcORB_h
#ifndef __bcIORBCOMPONENT_h__
#define __bcIORBCOMPONENT_h_
#include "nsISupports.h"
#include "bcIORB.h"
/*29bde10c-1dd2-11b2-ab23-ebe06c6baec5*/
#define BC_ORB_IID \
#define BC_ORBCOMPONENT_IID \
{ 0x29bde10c, 0x1dd2, 0x11b2, \
{0xab, 0x23, 0xeb, 0xe0, 0x6c, 0x6b, 0xae, 0xc5}}
#define BC_ORB_PROGID "component://netscape/blackwood/blackconnect/orb"
/*ffa0d768-1dd1-11b2-8bf2-ab56f26ea844*/
#define BC_ORB_CID \
{ 0xffa0d768, 0x1dd1, 0x11b2, \
{0x8b, 0xf2, 0xab, 0x56, 0xf2, 0x6e, 0xa8, 0x44 }}
class bcORB : public nsISupports {
NS_DECL_ISUPPORTS
NS_DEFINE_STATIC_IID_ACCESSOR(BC_ORB_IID)
NS_IMETHOD GetORB(bcIORB **orb);
bcORB();
virtual ~bcORB();
private:
bcIORB *orb;
class bcIORB;
class bcIORBComponent : public nsISupports {
public:
NS_DEFINE_STATIC_IID_ACCESSOR(BC_ORBCOMPONENT_IID)
NS_IMETHOD GetORB(bcIORB **orb) = 0;
};
#endif

24
mozilla/java/xpcom/connect/xpcom/bcORB.cpp → mozilla/java/xpcom/connect/xpcom/bcORBComponent.cpp
View File

@@ -19,44 +19,44 @@
* Contributor(s):
* Igor Kushnirskiy <idk@eng.sun.com>
*/
#include "bcORB.h"
#include "bcORBComponent.h"
#include "../src/ORB.h"
#include "nsIGenericFactory.h"
#include "nsIModule.h"
NS_GENERIC_FACTORY_CONSTRUCTOR(bcORB);
NS_GENERIC_FACTORY_CONSTRUCTOR(bcORBComponent);
static nsModuleComponentInfo components[] =
{
{
"Black Connect ORB",
BC_ORB_CID,
BC_ORB_PROGID,
bcORBConstructor
"Black Connect ORB Component",
BC_ORBCOMPONENT_CID,
BC_ORBCOMPONENT_ContractID,
bcORBComponentConstructor
}
};
NS_IMPL_NSGETMODULE("BlackConnectORB",components);
NS_IMPL_NSGETMODULE("BlackConnectORB component",components);
NS_IMPL_ISUPPORTS(bcORB,NS_GET_IID(bcORB));
NS_IMPL_ISUPPORTS(bcORBComponent,NS_GET_IID(bcORBComponent));
bcORB::bcORB() :
bcORBComponent::bcORBComponent() :
orb(0)
{
NS_INIT_REFCNT();
}
bcORB::~bcORB() {
bcORBComponent::~bcORBComponent() {
if (orb) {
delete orb; //nb should we destroy it?
}
}
NS_IMETHODIMP bcORB::GetORB(bcIORB **_orb) {
NS_IMETHODIMP bcORBComponent::GetORB(bcIORB **_orb) {
if (!_orb) {
printf("--bcORB::GetORB\n");
printf("--bcORBComponent::GetORB\n");
return NS_ERROR_NULL_POINTER;
}
if (!orb) {

39
mozilla/java/xpcom/connect/xpcom/bcORBComponent.h Normal file
View File

@@ -0,0 +1,39 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* The contents of this file are subject to the Mozilla Public
* License Version 1.1 (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.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is Sun Microsystems,
* Inc. Portions created by Sun are
* Copyright (C) 1999 Sun Microsystems, Inc. All
* Rights Reserved.
*
* Contributor(s):
* Igor Kushnirskiy <idk@eng.sun.com>
*/
#ifndef _bcORBCOMPONENT_h
#define _bcORBCOMPONENT_h
#include "bcIORBComponent.h"
#include "bcORBComponentCID.h"
#include "bcIORB.h"
class bcORBComponent : public bcIORBComponent {
NS_DECL_ISUPPORTS
NS_IMETHOD GetORB(bcIORB **orb);
bcORBComponent();
virtual ~bcORBComponent();
private:
bcIORB *orb;
};
#endif

35
mozilla/java/xpcom/connect/xpcom/bcORBComponentCID.h Normal file
View File

@@ -0,0 +1,35 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* The contents of this file are subject to the Mozilla Public
* License Version 1.1 (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.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is Sun Microsystems,
* Inc. Portions created by Sun are
* Copyright (C) 1999 Sun Microsystems, Inc. All
* Rights Reserved.
*
* Contributor(s):
* Igor Kushnirskiy <idk@eng.sun.com>
*/
#ifndef __bcORBComponentCID_h__
#define __bcORBComponentCID_h__
#define BC_ORBCOMPONENT_ContractID "@mozilla.org/blackwood/blackconnect/orbcomponent;1"
/*ffa0d768-1dd1-11b2-8bf2-ab56f26ea844*/
#define BC_ORBCOMPONENT_CID \
{ 0xffa0d768, 0x1dd1, 0x11b2, \
{0x8b, 0xf2, 0xab, 0x56, 0xf2, 0x6e, 0xa8, 0x44 }}
#endif

5
mozilla/java/xpcom/connect/xpcom/makefile.win
View File

@@ -30,11 +30,12 @@ DLLNAME = bcorb
DLL=.\$(OBJDIR)\$(DLLNAME).dll
OBJS= \
.\$(OBJDIR)\bcORB.obj \
.\$(OBJDIR)\bcORBComponent.obj \
$(NULL)
EXPORTS = \
bcORB.h \
bcIORBComponent.h \
bcORBComponentCID.h \
$(NULL)
LLIBS=$(LLIBS) $(LIBNSPR) $(DIST)\lib\xpcom.lib $(DIST)\lib\bcorbcore.lib