diff options
author | Melanie Thielker | 2009-07-07 16:21:51 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-07-07 16:21:51 +0000 |
commit | 3bfd98eae7caf877dc4eb55e1f295d74bf7efcdf (patch) | |
tree | 2c55f19d7ed60958f44e4f69a200318cb302ab5f | |
parent | Thank you, mcortez, for a patch to prebuild to allow includes with wildcards. (diff) | |
download | opensim-SC-3bfd98eae7caf877dc4eb55e1f295d74bf7efcdf.zip opensim-SC-3bfd98eae7caf877dc4eb55e1f295d74bf7efcdf.tar.gz opensim-SC-3bfd98eae7caf877dc4eb55e1f295d74bf7efcdf.tar.bz2 opensim-SC-3bfd98eae7caf877dc4eb55e1f295d74bf7efcdf.tar.xz |
Committing the basic universal server Technology (B.U.S.T.)
-rw-r--r-- | OpenSim/Server/ServerMain.cs | 1 | ||||
-rw-r--r-- | bin/OpenSim.Server.exe.config | 33 | ||||
-rw-r--r-- | bin/OpenSim.Server.ini.example | 27 | ||||
-rw-r--r-- | prebuild.xml | 33 |
4 files changed, 93 insertions, 1 deletions
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs index ee136f4..2beca3b 100644 --- a/OpenSim/Server/ServerMain.cs +++ b/OpenSim/Server/ServerMain.cs | |||
@@ -32,7 +32,6 @@ using System; | |||
32 | using System.Collections.Generic; | 32 | using System.Collections.Generic; |
33 | using OpenSim.Server.Base; | 33 | using OpenSim.Server.Base; |
34 | using OpenSim.Server.Handlers.Base; | 34 | using OpenSim.Server.Handlers.Base; |
35 | using OpenSim.Server.Handlers.Asset; | ||
36 | 35 | ||
37 | namespace OpenSim.Server | 36 | namespace OpenSim.Server |
38 | { | 37 | { |
diff --git a/bin/OpenSim.Server.exe.config b/bin/OpenSim.Server.exe.config new file mode 100644 index 0000000..c2d93c0 --- /dev/null +++ b/bin/OpenSim.Server.exe.config | |||
@@ -0,0 +1,33 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" ?> | ||
2 | <configuration> | ||
3 | <configSections> | ||
4 | <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> | ||
5 | </configSections> | ||
6 | <runtime> | ||
7 | <gcConcurrent enabled="true" /> | ||
8 | <gcServer enabled="true" /> | ||
9 | </runtime> | ||
10 | <appSettings> | ||
11 | </appSettings> | ||
12 | <log4net> | ||
13 | <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> | ||
14 | <layout type="log4net.Layout.PatternLayout"> | ||
15 | <conversionPattern value="%date{HH:mm:ss} - %message%newline" /> | ||
16 | </layout> | ||
17 | </appender> | ||
18 | |||
19 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> | ||
20 | <file value="OpenSim.log" /> | ||
21 | <appendToFile value="true" /> | ||
22 | <layout type="log4net.Layout.PatternLayout"> | ||
23 | <conversionPattern value="%date %-5level - %logger %message%newline" /> | ||
24 | </layout> | ||
25 | </appender> | ||
26 | |||
27 | <root> | ||
28 | <level value="DEBUG" /> | ||
29 | <appender-ref ref="Console" /> | ||
30 | <appender-ref ref="LogFileAppender" /> | ||
31 | </root> | ||
32 | </log4net> | ||
33 | </configuration> | ||
diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example new file mode 100644 index 0000000..ebd2d2c --- /dev/null +++ b/bin/OpenSim.Server.ini.example | |||
@@ -0,0 +1,27 @@ | |||
1 | ; * The startup section lists all the connectors to start up in this server | ||
2 | ; * instance. This may be only one, or it may be the entire server suite. | ||
3 | ; * Multiple connectors should be seaprated by commas. | ||
4 | ; * | ||
5 | ; * These are the IN connectors the server uses, the in connectors | ||
6 | ; * read tis config file and load the needed OUT and database connectors | ||
7 | ; * | ||
8 | [Startup] | ||
9 | ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector" | ||
10 | |||
11 | ; * This is common for all services, it's the network setup for the entire | ||
12 | ; * server instance | ||
13 | ; * | ||
14 | [Network] | ||
15 | port = 8003 | ||
16 | |||
17 | ; * As an example, the below configuration precisely mimicks the legacy | ||
18 | ; * asset server. It is read by the asset IN connector (defined above) | ||
19 | ; * and it then loads the OUT connector (a local database module). That, | ||
20 | ; * in turn, reads the asset loader and database connection information | ||
21 | ; * | ||
22 | [AssetService] | ||
23 | LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" | ||
24 | DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" | ||
25 | AssetLoaderArgs = "assets/AssetSets.xml" | ||
26 | StorageProvider = "OpenSim.Data.MySQL.dll" | ||
27 | ConnectionString = "Data Source=localhost;Database=grid;User ID=grid;Password=grid;" | ||
diff --git a/prebuild.xml b/prebuild.xml index 94d19c6..9634eb5 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -1528,6 +1528,39 @@ | |||
1528 | </Project> | 1528 | </Project> |
1529 | 1529 | ||
1530 | 1530 | ||
1531 | <Project name="OpenSim.Server" path="OpenSim/Server" type="Exe"> | ||
1532 | <Configuration name="Debug"> | ||
1533 | <Options> | ||
1534 | <OutputPath>../../bin/</OutputPath> | ||
1535 | </Options> | ||
1536 | </Configuration> | ||
1537 | <Configuration name="Release"> | ||
1538 | <Options> | ||
1539 | <OutputPath>../../bin/</OutputPath> | ||
1540 | </Options> | ||
1541 | </Configuration> | ||
1542 | |||
1543 | <ReferencePath>../../bin/</ReferencePath> | ||
1544 | <Reference name="System"/> | ||
1545 | <Reference name="System.Xml"/> | ||
1546 | <Reference name="OpenMetaverseTypes.dll"/> | ||
1547 | <Reference name="OpenMetaverse.dll"/> | ||
1548 | <Reference name="OpenMetaverse.StructuredData.dll"/> | ||
1549 | <Reference name="OpenSim.Framework"/> | ||
1550 | <Reference name="OpenSim.Framework.Console"/> | ||
1551 | <Reference name="OpenSim.Server.Base"/> | ||
1552 | <Reference name="OpenSim.Server.Handlers"/> | ||
1553 | <Reference name="Nini.dll" /> | ||
1554 | <Reference name="log4net.dll"/> | ||
1555 | |||
1556 | <Files> | ||
1557 | <Match pattern="*.cs" recurse="false"> | ||
1558 | <Exclude pattern="Tests" /> | ||
1559 | </Match> | ||
1560 | </Files> | ||
1561 | </Project> | ||
1562 | |||
1563 | |||
1531 | <Project name="OpenSim.Services" path="OpenSim/Server" type="Exe"> | 1564 | <Project name="OpenSim.Services" path="OpenSim/Server" type="Exe"> |
1532 | <Configuration name="Debug"> | 1565 | <Configuration name="Debug"> |
1533 | <Options> | 1566 | <Options> |