Skip to content

Commit

Permalink
GitHub sync (#1)
Browse files Browse the repository at this point in the history
* Changing BIMserver 1.5.183-SNAPSHOT to 1.5.183-BRU-SNAPSHOT

* Making model transient for serialization of IdEdObjects

* Added few utility functions

* Updates in RichModel

* New version

* Fixes

* Logging

* Comparison bug fixes

* Bugfixes

* Bugfixes

* Bimserver bug fixes

* Boolean/Tristate bug fix

* Tristate Boolean/String bugfix

* Rough hack
opensourceBIM#1256

* Fixed some bugs related to merging

* Fixed some bugs related to merging

* Fixed some bugs related to merging

* offline geometry generator

* Geometry small fix

* https://app.asana.com/0/1200852714700592/1203063871445778/f

* https://app.asana.com/0/1200852714700592/1203029394700331

* Bytes multiplier fix

* https://app.asana.com/0/inbox/1202159521683876

* merging updates

* https://app.asana.com/0/1200852714700592/1203259800939093

* find duplicates of rels

* Temp version

* Update merger

* find duplicates of rels

* Update merger

* find duplicates of rels

* Update merger

* addLongAttribute to LowLevelInterface

* add local BB

* https://app.asana.com/0/1200852714700592/1203099333116440

* Feature/debug log add

* Hotfix/logger fix

* generate ifc4x3 models

* fixed compile

* added missing pieces to support ifc4x3

* removed extra spaces

* Доработка конвертера для оптимизации генерации офлайн геометрии (выгрузки минимальной модели)

* added mismatches

* generate database ifc4x3-geometry queries

* fixed errors which happens on start bimserver

* Feature/add physically delete

* Fix/extract hard delete

* fixed Content-Disposition header

* removed log of query on download action

* removed log of query on download action

* worked version

* added geometry to ifc4x3.IfcProduct

* changed schema name to IFC4X3_ADD1

* changed Schema name to IFC4X3

* added brusnika repository

* bump up buildingsmartlibrary version

* Fixes/http client cookie

* update logback.xml

* Revert "Fix/extract hard delete"

This reverts commit ae348b1.

* Revert "Feature/add physically delete"

This reverts commit b369694.

* removed extra repo

* removed settings

---------

Co-authored-by: BRUSNIKA\d.kurillo <[email protected]>
Co-authored-by: d.evdokimova <[email protected]>
Co-authored-by: Павел Кожанов <[email protected]>
Co-authored-by: Константин Безгодов <[email protected]>
Co-authored-by: Константин Безгодов <[email protected]>
  • Loading branch information
6 people authored Mar 25, 2024
1 parent 6daa43a commit eaa52d1
Show file tree
Hide file tree
Showing 2,538 changed files with 846,997 additions and 6,995 deletions.
279 changes: 279 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,279 @@

# Created by https://www.toptal.com/developers/gitignore/api/osx,java,eclipse,intellij,maven,visualstudiocode
# Edit at https://www.toptal.com/developers/gitignore?templates=osx,java,eclipse,intellij,maven,visualstudiocode

### Eclipse ###
.metadata
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.settings/
.loadpath
.recommenders

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# PyDev specific (Python IDE for Eclipse)
*.pydevproject

# CDT-specific (C/C++ Development Tooling)
.cproject

# CDT- autotools
.autotools

# Java annotation processor (APT)
.factorypath

# PDT-specific (PHP Development Tools)
.buildpath

# sbteclipse plugin
.target

# Tern plugin
.tern-project

# TeXlipse plugin
.texlipse

# STS (Spring Tool Suite)
.springBeans

# Code Recommenders
.recommenders/

# Annotation Processing
.apt_generated/
.apt_generated_test/

# Scala IDE specific (Scala & Java development for Eclipse)
.cache-main
.scala_dependencies
.worksheet

# Uncomment this line if you wish to ignore the project description file.
# Typically, this file would be tracked if it contains build/dependency configurations:
#.project

### Eclipse Patch ###
# Spring Boot Tooling
.sts4-cache/

### Intellij ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# AWS User-specific
.idea/**/aws.xml

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# SonarLint plugin
.idea/sonarlint/

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

### Intellij Patch ###
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721

# *.iml
# modules.xml
# .idea/misc.xml
# *.ipr

# Sonarlint plugin
# https://plugins.jetbrains.com/plugin/7973-sonarlint
.idea/**/sonarlint/

# SonarQube Plugin
# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
.idea/**/sonarIssues.xml

# Markdown Navigator plugin
# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
.idea/**/markdown-navigator.xml
.idea/**/markdown-navigator-enh.xml
.idea/**/markdown-navigator/

# Cache file creation bug
# See https://youtrack.jetbrains.com/issue/JBR-2257
.idea/$CACHE_FILE$

# CodeStream plugin
# https://plugins.jetbrains.com/plugin/12206-codestream
.idea/codestream.xml

# Azure Toolkit for IntelliJ plugin
# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij
.idea/**/azureSettings.xml

### Java ###
# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
replay_pid*

### Maven ###
target/
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties
# https://github.com/takari/maven-wrapper#usage-without-binary-jar
.mvn/wrapper/maven-wrapper.jar

# Eclipse m2e generated files
# Eclipse Core
.project
# JDT-specific (Eclipse Java Development Tools)
.classpath

### OSX ###
# General
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon


# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

### VisualStudioCode ###
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
!.vscode/*.code-snippets

# Local History for Visual Studio Code
.history/

# Built Visual Studio Code Extensions
*.vsix

### VisualStudioCode Patch ###
# Ignore all local history of files
.history
.ionide

# End of https://www.toptal.com/developers/gitignore/api/osx,java,eclipse,intellij,maven,visualstudiocode

tmptestdata
8 changes: 8 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"java.compile.nullAnalysis.mode": "automatic",
"java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx4G -Xms100m -Xlog:disable",
"maven.view": "hierarchical",
"editor.insertSpaces": false,
"editor.tabSize": 2,
"java.configuration.updateBuildConfiguration": "interactive"
}
4 changes: 2 additions & 2 deletions Bdb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<parent>
<groupId>org.opensourcebim</groupId>
<artifactId>parent</artifactId>
<version>1.5.185-SNAPSHOT</version>
<version>1.5.186-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
<name>Bdb</name>
<dependencies>
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
<version>7.5.11</version>
<version>18.3.12</version>
</dependency>
</dependencies>
<repositories>
Expand Down
1 change: 0 additions & 1 deletion BimServer/.settings/org.eclipse.jdt.apt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#Thu May 12 16:24:36 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.apt.aptEnabled=true
org.eclipse.jdt.apt.genSrcDir=.apt_generated
Expand Down
11 changes: 10 additions & 1 deletion BimServer/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
org.eclipse.jdt.core.compiler.problem.nullReference=warning
org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
org.eclipse.jdt.core.compiler.processAnnotations=enabled
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=1.8
2 changes: 1 addition & 1 deletion BimServer/deploy/IFC4_ADD2.exp
Original file line number Diff line number Diff line change
Expand Up @@ -11288,7 +11288,7 @@ END_LOCAL;
RETURN(?);
ELSE
BEGIN
V1 := IfcNormalise(Arg1)\IfcDirection.DirectionRatios;
V1 := IfcNormalise(Arg1)\IfcDirection.DirectionRatios;

V2 := IfcNormalise(Arg2)\IfcDirection.DirectionRatios;
Res := IfcRepresentationItem() || IfcGeometricRepresentationItem ()
Expand Down
Loading

0 comments on commit eaa52d1

Please sign in to comment.